Merge remote-tracking branch 'origin/master'

liujie

2023-10-31 1c08cdb19aa0531dc77665dbbde052133dff9ceb

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java

@@ -63,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";
    }

@@ -79,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";
    }

@@ -88,9 +92,11 @@
     */
    @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");
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
        String startTime = formatter.format(competition.getStartTime());
        model.addAttribute("startTime",startTime);
        String endTime = formatter.format(competition.getEndTime());
@@ -100,7 +106,16 @@




        model.addAttribute("item",competition);
        String[] split = competition.getStoreId().split(",");
        List<Integer> integers = new ArrayList<>();
        for (String s : split) {
            integers.add(Integer.valueOf(s));
        }

        model.addAttribute("storeIds",integers);

        List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
        TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode()));
        List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
@@ -114,6 +129,8 @@
    }
    @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());