Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

Merge remote-tracking branch 'origin/2.0' into 2.0

# Conflicts:
#	cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
#	cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java

 cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java

@@ -20,6 +20,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.swagger2.mappers.ModelMapper;

@@ -1086,14 +1087,20 @@
    public HashMap<String, Object> queryUserAge1() {
        HashMap<String, Object> map = new HashMap<>();
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1)
                        .isNotNull(TAppUser::getPhone)
                .ne(TAppUser::getState,3)
                .isNotNull(TAppUser::getCity));
        Set<String> strings2 = new HashSet<>(list.stream().filter(e -> e.getCity().equals("[]")).collect(Collectors.groupingBy(TAppUser::getProvince)).keySet());
        List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
        if (collect.size() == 0) {
            collect.add(-1);
        }


        Set<String> strings = list.stream().collect(Collectors.groupingBy(TAppUser::getCity)).keySet();
        Set<String> strings = new HashSet<>(list.stream()
                .filter(e -> !e.getCity().equals("[]") && StringUtils.hasLength(e.getCity()))
                .collect(Collectors.groupingBy(TAppUser::getCity))
                .keySet());
        strings.addAll(strings2);
        ArrayList<String> strings1 = new ArrayList<>();
        ArrayList<Integer> integers = new ArrayList<>();

@@ -1101,13 +1108,14 @@
            int a = 0;
            strings1.add(string);
            for (TAppUser tAppUser : list) {
                if (tAppUser.getCity().equals(string)) {
                if (tAppUser.getCity()!=null&&tAppUser.getCity().equals(string)) {
                    a++;
                }else if (tAppUser.getProvince()!=null&&tAppUser.getProvince().equals(string)){
                    a++;
                }
            }
            integers.add(a);
        }

        map.put("cityData", strings1);
        map.put("cityNum", integers);
        int age1 = 0;
@@ -1160,14 +1168,22 @@
    @PostMapping("/student/queryUserAgeYys")
    public HashMap<String, Object> queryUserAgeYys(@RequestBody List<Integer> ids) {
        HashMap<String, Object> map = new HashMap<>();
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids));
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids)
                .isNotNull(TAppUser::getPhone)
                .ne(TAppUser::getState,3)
                .isNotNull(TAppUser::getCity));
        Set<String> strings2 = new HashSet<>(list.stream().filter(e -> e.getCity().equals("[]")).collect(Collectors.groupingBy(TAppUser::getProvince)).keySet());
        List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
        if (collect.size() == 0) {
            collect.add(-1);
        }


        Set<String> strings = list.stream().collect(Collectors.groupingBy(TAppUser::getCity)).keySet();
        Set<String> strings = new HashSet<>(list.stream()
                .filter(e -> !e.getCity().equals("[]") && StringUtils.hasLength(e.getCity()))
                .collect(Collectors.groupingBy(TAppUser::getCity))
                .keySet());
        strings.addAll(strings2);
        ArrayList<String> strings1 = new ArrayList<>();
        ArrayList<Integer> integers = new ArrayList<>();

@@ -1175,7 +1191,9 @@
            int a = 0;
            strings1.add(string);
            for (TAppUser tAppUser : list) {
                if (tAppUser.getCity().equals(string)) {
                if (tAppUser.getCity()!=null&&tAppUser.getCity().equals(string)) {
                    a++;
                }else if (tAppUser.getProvince()!=null&&tAppUser.getProvince().equals(string)){
                    a++;
                }
            }
@@ -1233,14 +1251,22 @@
    @PostMapping("/student/queryUserAgeStore")
    public HashMap<String, Object> queryUserAgeStore(@RequestBody List<Integer> ids) {
        HashMap<String, Object> map = new HashMap<>();
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids));
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids)
                .isNotNull(TAppUser::getPhone)
                .ne(TAppUser::getState,3)
                .isNotNull(TAppUser::getCity));
        List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
        if (collect.size() == 0) {
            collect.add(-1);
        }
        Set<String> strings2 = new HashSet<>(list.stream().filter(e -> e.getCity().equals("[]")).collect(Collectors.groupingBy(TAppUser::getProvince)).keySet());


        Set<String> strings = list.stream().collect(Collectors.groupingBy(TAppUser::getCity)).keySet();
        Set<String> strings = new HashSet<>(list.stream()
                .filter(e -> !e.getCity().equals("[]") && StringUtils.hasLength(e.getCity()))
                .collect(Collectors.groupingBy(TAppUser::getCity))
                .keySet());
        strings.addAll(strings2);
        ArrayList<String> strings1 = new ArrayList<>();
        ArrayList<Integer> integers = new ArrayList<>();

@@ -1248,7 +1274,9 @@
            int a = 0;
            strings1.add(string);
            for (TAppUser tAppUser : list) {
                if (tAppUser.getCity().equals(string)) {
                if (tAppUser.getCity()!=null&&tAppUser.getCity().equals(string)) {
                    a++;
                }else if (tAppUser.getProvince()!=null&&tAppUser.getProvince().equals(string)){
                    a++;
                }
            }

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

@@ -114,14 +114,14 @@
    }
    @RequestMapping("/tShop_info/{id}")
    public String tCityInfo(@PathVariable("id") Integer id, Model model) {
        System.err.println("進入");
        TEvaluationListVo vo = evaluationService.info(id);
        System.err.println("查詢vo");
        model.addAttribute("item",vo);
        ArrayList<String> strings = new ArrayList<>();
        String imgs = vo.getImgs();
        for (String s : imgs.split(",")) {
            strings.add(s);
        if (!ToolUtil.isEmpty(imgs)){
            for (String s : imgs.split(",")) {
                strings.add(s);
            }
        }
        model.addAttribute("imgs",strings);
        model.addAttribute("name1",vo.getPName());

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

@@ -868,6 +868,7 @@

@Autowired
private IUserService userService;

    @RequestMapping("/yueyue_info/{id}")
    public String yueyue_info(@PathVariable("id") Integer id,Model model) {

@@ -933,8 +934,7 @@

        List<OrderDto> timeRanges = new ArrayList<>();


        Site site =  siteClient.listById(book.getSiteId());
        TSite site = siteService.getById(book.getSiteId());
        System.out.println("================"+site);
        String appointmentStartTime = site.getAppointmentStartTime();
        String appointmentEndTime = site.getAppointmentEndTime();

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html

@@ -150,7 +150,9 @@
                    <label class="col-sm-3 control-label head-scu-label">*上传凭证：</label>
                    <div class="col-sm-2">
                        <div id="introduceDrawingPreId">
                            @if(isNotEmpty(item.voucher)){
                            <div><img width="100px" height="100px" src="${item.voucher}"></div>
                            @}
                        </div>
                    </div>
                    <div class="col-sm-2">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html

@@ -1273,6 +1273,18 @@
            var option;

            option = {
                tooltip: {
                    trigger: 'axis',
                    axisPointer: {
                        type: 'shadow'
                    }
                },
                grid: {
                    left: '3%',
                    right: '4%',
                    bottom: '3%',
                    containLabel: true
                },
                xAxis: {
                    type: 'category',
                    data: data.cityData

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html

@@ -1280,6 +1280,18 @@
                var option;

                option = {
                    tooltip: {
                        trigger: 'axis',
                        axisPointer: {
                            type: 'shadow'
                        }
                    },
                    grid: {
                        left: '3%',
                        right: '4%',
                        bottom: '3%',
                        containLabel: true
                    },
                    xAxis: {
                        type: 'category',
                        data: data.cityData

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html

@@ -654,6 +654,18 @@
            var option;

            option = {
                tooltip: {
                    trigger: 'axis',
                    axisPointer: {
                        type: 'shadow'
                    }
                },
                grid: {
                    left: '3%',
                    right: '4%',
                    bottom: '3%',
                    containLabel: true
                },
                xAxis: {
                    type: 'category',
                    data: data.cityData

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShopEvaluation/TShop_edit.html

@@ -14,9 +14,12 @@
            <div class="form-group">
                <label class="col-sm-3 control-label">评价图片：</label>
                <div class="col-sm-9">
                    @if(isNotEmpty(imgs)){
                    @for(o in imgs){
                    <img src=${o} style="width: 163px;height: 96px;">
                    @}
                    @}

                </div>
            </div>