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/TCompetitionController.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index 664a1ae..520b575 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -11,9 +11,11 @@
 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.TOperatorCity;
 import com.dsh.guns.modular.system.model.TStore;
 import com.dsh.guns.modular.system.service.ICityService;
 import com.dsh.guns.modular.system.service.IStoreService;
+import com.dsh.guns.modular.system.service.TOperatorCityService;
 import com.dsh.guns.modular.system.service.TOperatorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -23,8 +25,10 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -59,6 +63,8 @@
     public String index(Model model) {
         List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
         model.addAttribute("list",list);
+        Integer objectType = UserExt.getUser().getObjectType();
+        model.addAttribute("type",objectType);
         return PREFIX + "TCompetition.html";
     }
 
@@ -75,6 +81,8 @@
 
         List<TOperator> list1 = tOperatorService.list();
         model.addAttribute("yysList",list1);
+        Integer objectType = UserExt.getUser().getObjectType();
+        model.addAttribute("type",objectType);
         return PREFIX + "TCompetition_add.html";
     }
 
@@ -84,7 +92,20 @@
      */
     @RequestMapping("/tCompetition_update/{id}")
     public String tCarUpdate(@PathVariable Integer id, Model model) {
+        Integer objectType = UserExt.getUser().getObjectType();
+        model.addAttribute("objectType",objectType);
         Competition competition = competitionClient.queryById(id);
+        System.out.println("======competition======"+competition);
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String startTime = formatter.format(competition.getStartTime());
+        model.addAttribute("startTime",startTime);
+        String endTime = formatter.format(competition.getEndTime());
+        model.addAttribute("endTime",endTime);
+        String registerEndTime = formatter.format(competition.getRegisterEndTime());
+        model.addAttribute("registerEndTime",registerEndTime);
+
+
+
         model.addAttribute("item",competition);
         List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
         TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode()));
@@ -99,7 +120,16 @@
     }
     @RequestMapping("/tCompetition_info/{id}")
     public String tCarInfo(@PathVariable Integer id, Model model) {
+        Integer objectType = UserExt.getUser().getObjectType();
+        model.addAttribute("objectType",objectType);
         Competition competition = competitionClient.queryById(id);
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String startTime = formatter.format(competition.getStartTime());
+        model.addAttribute("startTime",startTime);
+        String endTime = formatter.format(competition.getEndTime());
+        model.addAttribute("endTime",endTime);
+        String registerEndTime = formatter.format(competition.getRegisterEndTime());
+        model.addAttribute("registerEndTime",registerEndTime);
         model.addAttribute("item",competition);
         List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
         TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode()));
@@ -253,9 +283,17 @@
         }
     }
 
+    @Autowired
+    private TOperatorCityService operatorCityService;
     @RequestMapping(value = "/onChange")
     @ResponseBody
     public Object onChange(Integer oneId) {
+        System.out.println("======"+oneId);
+        List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, oneId).eq(TOperatorCity::getType, 2));
+            if (list.size()!=0){
+                return list;
+            }
+
         try {
             TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
             return cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));

--
Gitblit v1.7.1