Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

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

@@ -429,7 +429,6 @@
        return PREFIX + "coursePackageDiscount.html";
    }


    /**
     * 跳转到报名列表页
     * @param model
@@ -610,8 +609,32 @@
            model.addAttribute("auditStatus", tCoursePackage.getAuditStatus());

        model.addAttribute("authRemark", tCoursePackage.getAuthRemark());
        String classStartTime = tCoursePackage.getClassStartTime();
        String classEndTime = tCoursePackage.getClassEndTime();
        if (tCoursePackage.getStartTime()!=null) {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            String dateString = sdf.format(tCoursePackage.getStartTime());
            String dateString1 = sdf.format(tCoursePackage.getEndTime());
            model.addAttribute("holi", dateString + " - " + dateString1);
        }
        String[] split1 = classStartTime.split(",");
        String[] split2 = classEndTime.split(",");

        model.addAttribute("classTime", tCoursePackage.getClassStartTime() + ":00 - " + tCoursePackage.getClassEndTime() + ":00");
        List<String> listtime = new ArrayList<>();

        for (int i = 0; i < split1.length; i++) {
            String o = split1[i]+"-"+split2[i];
            listtime.add(o);
        }


        model.addAttribute("time1",listtime.remove(0));
        if (listtime.size()!=0) {
            model.addAttribute("times", listtime);
        }
        model.addAttribute("classTime",
                tCoursePackage.getClassStartTime() + ":00 - "
                        + tCoursePackage.getClassEndTime() + ":00");
        String[] split = tCoursePackage.getClassWeeks().split(";");
        List<String> list5 = Arrays.asList("周一", "周二", "周三", "周四", "周五", "周六", "周日");
        List<Map<String, Object>> classWeeks = new ArrayList<>();
@@ -648,7 +671,8 @@
            model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);}
        model.addAttribute("coursePackagePaymentConfig", list4.remove(0));
        model.addAttribute("coursePackagePaymentConfigs", list4);

        Integer type = tCoursePackage.getType();
        model.addAttribute("type",type);
        return PREFIX + "examineCoursePackage_info.html";
    }

@@ -663,7 +687,6 @@
    @ResponseBody
    @PostMapping("/queryCity")
    public List<Map<String, Object>> queryCity(String code){

        Integer objectType = UserExt.getUser().getObjectType();
        Integer objectId = UserExt.getUser().getObjectId();
        String cityCode = null;
@@ -865,7 +888,8 @@
        if(objectType == 3) {// 门店
            storeIds.add(objectId);
        }
        Page<Map<String, Object>> mapPage = coursePackageService.queryCoursePackageLists(provinceCode, cityCode, coursePackageTypeId, storeIds, name, status, state);
        Page<Map<String, Object>> mapPage = coursePackageService.queryCoursePackageLists(provinceCode,
                cityCode, coursePackageTypeId, storeIds, name, status, state);
        return super.packForBT(mapPage);
    }