From 3530f728388d91b09a62fbd8f82d3a56b1ff265b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 10:36:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 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 3fa750c..f146b76 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
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.account.CityManagerClient;
@@ -15,12 +14,12 @@
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.dto.SelectDto;
-import com.dsh.guns.modular.system.service.*;
+import com.dsh.guns.modular.system.service.ICoursePackageService;
+import com.dsh.guns.modular.system.service.IStoreService;
+import com.dsh.guns.modular.system.service.ITSiteService;
import com.dsh.guns.modular.system.util.ResultUtil;
import io.swagger.models.auth.In;
import org.aspectj.weaver.ast.Var;
@@ -71,8 +70,7 @@
@Resource
private CoursePackageClient coursePackageClient;
- @Autowired
- private ICityService cityService;
+
@@ -102,16 +100,20 @@
* @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";
@@ -132,7 +134,9 @@
String cityCode = null;
if(objectType == 2){//城市管理员
CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
+ if (cityManager!=null){
+ cityCode = cityManager.getCityCode();
+ }
}
List<Map<String, Object>> list = storeService.queryProvince(cityCode);
model.addAttribute("province", list);
@@ -150,6 +154,7 @@
model.addAttribute("type",type);
+ model.addAttribute("objectType",objectType);
System.out.println("========type========"+type);
// if (type ==1){
// return PREFIX + "coursePackage_edit.html";
@@ -643,10 +648,10 @@
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
String cityCode = null;
- if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
- }
+// if(objectType == 2){//城市管理员
+// CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
+// cityCode = cityManager.getCityCode();
+// }
System.out.println("======="+storeService.queryCity(code, cityCode));
// return storeService.queryCity(code, cityCode);
return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
@@ -1092,7 +1097,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