From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 98 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 32 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 7d86135..cb9f256 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
@@ -12,13 +12,11 @@
import com.dsh.course.feignClient.account.model.Coach;
import com.dsh.course.feignClient.course.*;
import com.dsh.course.feignClient.course.model.*;
+import com.dsh.course.feignClient.other.model.Site;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.TCity;
-import com.dsh.guns.modular.system.model.TOperator;
-import com.dsh.guns.modular.system.model.TSite;
-import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.SelectDto;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.ResultUtil;
@@ -71,9 +69,11 @@
@Resource
private CoursePackageClient coursePackageClient;
- @Autowired
- private ICityService cityService;
+ @Autowired
+ private TOperatorService tOperatorService;
+ @Autowired
+ private TOperatorCityService tOperatorCityService;
/**
@@ -94,24 +94,28 @@
*/
@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);
}
/**
* 跳转到列表页
* @param model
* @return
*/
- @Autowired
- private TOperatorService operatorService;
@GetMapping("/openCoursePackageListPage")
public String openCoursePackageListPage(Model model){
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
List<TCoursePackageType> tCoursePackageTypes = coursePackageTypeClient.queryAllCoursePackageType();
model.addAttribute("coursePackageType", tCoursePackageTypes);
-
- List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ String cityCode = null;
+ if(objectType == 2){//城市管理员
+ CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
+ if (cityManager!=null){
+ cityCode = cityManager.getCityCode();
+ }
+ }
+ List<Map<String, Object>> list = storeService.queryProvince(cityCode);
model.addAttribute("province", list);
model.addAttribute("objectType", objectType);
return PREFIX + "coursePackage.html";
@@ -123,34 +127,50 @@
* @param model
* @return
*/
+ @Autowired
+ private ICityService cityService;
@GetMapping("/openAddCoursePackage")
public String openAddCoursePackage(Model model,Integer type){
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
List<TCoursePackageType> tCoursePackageTypes = coursePackageTypeClient.queryAllCoursePackageType();
model.addAttribute("coursePackageType", tCoursePackageTypes);
- String cityCode = null;
+ String cityCode = "";
if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
+ // 获取到这个运营商下面的所有门店
+ List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId",objectId));
+ model.addAttribute("store", operatorId);
+ List<Coach> coach = coachClient.queryCoachByOperatorId(objectId);
+ model.addAttribute("coach", coach);
+ // 如果该运营商下面没有门店
+ if (operatorId.size()==0){
+ List<TStore> o = new ArrayList<>();
+ List<TSite> tSites = new ArrayList<>();
+ model.addAttribute("store", o);
+ model.addAttribute("site", tSites);
+ }else{
+ List<TSite> storeId = siteService.list(new QueryWrapper<TSite>()
+ .eq("storeId", operatorId.get(0).getId()));
+ model.addAttribute("site", storeId);
+ }
+ }else{
+ List<Map<String, Object>> list = storeService.queryProvince(cityCode);
+ model.addAttribute("province", list);
+ Object code = list.get(0).get("code");
+ List<Map<String, Object>> list1 = storeService.queryCity(code.toString(), cityCode);
+ model.addAttribute("city", list1);
+ String code1 = list1.get(0).get("code").toString();
+ List<TStore> list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
+ model.addAttribute("store", list2);
+ TStore store = list2.get(0);
+ List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
+ model.addAttribute("site", list3);
+ List<Coach> coaches = coachClient.queryCoachByCity(code1);
+ model.addAttribute("coach", coaches);
+ System.out.println("========type========"+type);
}
- List<Map<String, Object>> list = storeService.queryProvince(cityCode);
- model.addAttribute("province", list);
- Object code = list.get(0).get("code");
- List<Map<String, Object>> list1 = storeService.queryCity(code.toString(), cityCode);
- model.addAttribute("city", list1);
- String code1 = list1.get(0).get("code").toString();
- List<TStore> list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
- model.addAttribute("store", list2);
- TStore store = list2.get(0);
- List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
- model.addAttribute("site", list3);
- List<Coach> coaches = coachClient.queryCoachByCity(code1);
- model.addAttribute("coach", coaches);
-
-
+ model.addAttribute("objectType",objectType);
model.addAttribute("type",type);
- System.out.println("========type========"+type);
// if (type ==1){
// return PREFIX + "coursePackage_edit.html";
// }
@@ -839,6 +859,7 @@
Date startDate = null;
Date endDate =null ;
+
String holitime = coursePackage.getHolitime();
if (holitime!=null&&holitime!="") {
String[] dateParts = holitime.split(" - ");
@@ -886,6 +907,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);
@@ -1092,7 +1126,7 @@
* @return
*/
@ResponseBody
- @PostMapping("/queryWalkInStudentList")
+ @PostMapping("/queryWalkInStudentListqueryCoursePackageLists")
public Object queryWalkInStudentList(Long coursePackageSchedulingId, String userName, String studentName){
Page<Map<String, Object>> page = coursePackageService.queryWalkInStudentList(coursePackageSchedulingId, userName, studentName);
return super.packForBT(page);
--
Gitblit v1.7.1