From c0db57abe71d3cedf5ad8326a03b8ad6cbfea43c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 09:38:01 +0800
Subject: [PATCH] 10.13bug2
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 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 5a3359d..d229586 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,6 +3,7 @@
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;
@@ -14,12 +15,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.ICoursePackageService;
-import com.dsh.guns.modular.system.service.IStoreService;
-import com.dsh.guns.modular.system.service.ITSiteService;
+import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.ResultUtil;
import io.swagger.models.auth.In;
import org.aspectj.weaver.ast.Var;
@@ -70,7 +71,8 @@
@Resource
private CoursePackageClient coursePackageClient;
-
+ @Autowired
+ private ICityService cityService;
@@ -100,18 +102,16 @@
* @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);
- String cityCode = null;
- if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
- }
- List<Map<String, Object>> list = storeService.queryProvince(cityCode);
+
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
model.addAttribute("province", list);
model.addAttribute("objectType", objectType);
return PREFIX + "coursePackage.html";
@@ -643,13 +643,22 @@
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);
+ }
+
+ @ResponseBody
+ @PostMapping("/queryCity3")
+ public ResultUtil queryCity3(){
+
+ System.out.println("======="+storeService.queryCity1());
+// return storeService.queryCity(code, cityCode);
+ return new ResultUtil(0,null,null,storeService.queryCity1(),null);
}
@@ -1083,7 +1092,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