From 1eb07ec3e65ae47267becdbe7e7bc95ce40fec52 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 31 十月 2023 20:25:26 +0800
Subject: [PATCH] 10.31.1
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index 551bfcd..9bb8475 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -94,8 +94,8 @@
*/
@ResponseBody
@RequestMapping("/getCoursePackageByType")
- public List<TCoursePackage> getCoursePackageByType(Integer storeId){
- return coursePackageClient.getCoursePackageByType(storeId);
+ public List<TCoursePackage> getCoursePackageByType(Integer storeId,Integer typeId){
+ return coursePackageClient.getCoursePackageByType(typeId,storeId);
}
/**
* 跳转到列表页
@@ -189,6 +189,9 @@
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
model.addAttribute("type", tCoursePackage.getType());
+
+ Integer objectType = UserExt.getUser().getObjectType();
+ model.addAttribute("objectType",objectType);
String classStartTime = tCoursePackage.getClassStartTime();
String classEndTime = tCoursePackage.getClassEndTime();
@@ -859,6 +862,7 @@
Date startDate = null;
Date endDate =null ;
+
String holitime = coursePackage.getHolitime();
if (holitime!=null&&holitime!="") {
String[] dateParts = holitime.split(" - ");
@@ -906,6 +910,19 @@
coursePackage.setStatus(1);
coursePackage.setState(1);
coursePackage.setInsertTime(new Date());
+ Integer objectType = UserExt.getUser().getObjectType();
+ Integer objectId = UserExt.getUser().getObjectId();
+
+ if (objectType==2){
+ Integer storeId = coursePackage.getStoreId();
+ TStore store = storeService.getOne(new QueryWrapper<TStore>().eq("id", storeId));
+ coursePackage.setProvince(store.getProvince());
+ coursePackage.setProvinceCode(store.getProvinceCode());
+ coursePackage.setCity(store.getCity());
+ coursePackage.setCityCode(store.getCityCode());
+ }
+
+
// 详情多图片
// String substring = coursePackage.getDetailDrawing().substring(0, coursePackage.getDetailDrawing().length() - 1);
// coursePackage.setDetailDrawing(substring);
--
Gitblit v1.7.1