From ee9cb0da4a43bcf523ebb157678f64a2895fba1a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 10 十月 2023 15:30:38 +0800
Subject: [PATCH] 10.10

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java |   62 ++++++++++++++++++++++++++++++-
 1 files changed, 60 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 c67343c..ae08367 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
@@ -16,6 +16,7 @@
 import com.dsh.guns.core.util.ToolUtil;
 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;
@@ -546,6 +547,16 @@
     }
 
 
+    @GetMapping("/queryProvince")
+    @ResponseBody
+    public List<Map<String, Object>> queryProvince(){
+
+        List<Map<String, Object>> list = storeService.queryProvince(null);
+
+        return list;
+    }
+
+
     /**
      * 跳转到审核详情页
      * @param model
@@ -556,6 +567,11 @@
     public String showExamineCoursePackageDetails(Model model, Integer id){
         TCoursePackage tCoursePackage = coursePackageService.queryById(id);
         model.addAttribute("item", tCoursePackage);
+        System.out.println("============"+ tCoursePackage.getAuditStatus());
+            model.addAttribute("auditStatus", tCoursePackage.getAuditStatus());
+
+        model.addAttribute("authRemark", tCoursePackage.getAuthRemark());
+
         model.addAttribute("classTime", tCoursePackage.getClassStartTime() + ":00 - " + tCoursePackage.getClassEndTime() + ":00");
         String[] split = tCoursePackage.getClassWeeks().split(";");
         List<String> list5 = Arrays.asList("周一", "周二", "周三", "周四", "周五", "周六", "周日");
@@ -608,6 +624,7 @@
     @ResponseBody
     @PostMapping("/queryCity")
     public List<Map<String, Object>> queryCity(String code){
+
         Integer objectType = UserExt.getUser().getObjectType();
         Integer objectId = UserExt.getUser().getObjectId();
         String cityCode = null;
@@ -615,7 +632,24 @@
             CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
             cityCode = cityManager.getCityCode();
         }
+        System.out.println("======="+storeService.queryCity(code, cityCode));
         return storeService.queryCity(code, cityCode);
+    }
+
+
+    @ResponseBody
+    @PostMapping("/queryCity1/{code}")
+    public ResultUtil queryCity1(@PathVariable("code") String code){
+        Integer objectType = UserExt.getUser().getObjectType();
+        Integer objectId = UserExt.getUser().getObjectId();
+        String cityCode = null;
+        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);
     }
 
 
@@ -628,7 +662,28 @@
     @PostMapping("/queryStore")
     public List<TStore> queryStore(String cityCode){
         List<TStore> list = storeService.list(new QueryWrapper<TStore>().eq("cityCode", cityCode).eq("state", 1));
+        System.out.println("====list="+list);
         return list;
+    }
+
+
+    @ResponseBody
+    @PostMapping("/queryStore1/{cityCode}")
+    public ResultUtil queryStore1(@PathVariable("cityCode") String cityCode){
+        List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("cityCode", cityCode).eq("state", 1));
+//        Map<String,Integer> map = new LinkedHashMap<>();
+        List<SelectDto>  selectDtos = new ArrayList<>();
+        Map<String,Integer> map = new HashMap<>();
+//        for (TStore store : list) {
+//            SelectDto selectDto = new SelectDto();
+//            selectDto.setId(Long.valueOf(store.getId()));
+//            selectDto.setValue(store.getName());
+//               selectDtos.add(selectDto);
+//
+//        }
+//        map.put("options",selectDtos);
+
+        return new ResultUtil(0,0,null,list,null);
     }
 
     /**
@@ -639,7 +694,8 @@
     @ResponseBody
     @PostMapping("/querySite")
     public List<TSite> querySite(Integer storeId){
-        List<TSite> list = siteService.list(new QueryWrapper<TSite>().eq("storeId", storeId).eq("state", 1));
+        System.out.println("==storeId==="+storeId);
+        List<TSite> list = siteService.list(new QueryWrapper<TSite>().select("id","name").eq("storeId", storeId).eq("state", 1));
         return list;
     }
 
@@ -774,8 +830,10 @@
 
             String jsonString = jsonArray.getString(i);
             String[] split = jsonString.split("-");
+            System.out.println("============"+split);
+            if (split.length>1){
             first.add(split[0]);
-            second.add(split[1]);
+            second.add(split[1]);}
 
         }
         String firstString = String.join(",",first);

--
Gitblit v1.7.1