无关风月
2024-12-31 0c51a577db337520452022d9d6a22b720ef858d4
xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java
@@ -179,7 +179,7 @@
        Map<String, Object> x = new HashMap<>();
        Map<String, Object> x1 = new HashMap<>();
        Map<String, Object> x2 = new HashMap<>();
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd");
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("d");
        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
        Calendar calendar = Calendar.getInstance();
        switch (homeDto.getTimeType()){
@@ -273,7 +273,7 @@
                    List<LocalDate> localDates = new ArrayList<>();
                    while (!startLocalDate.isAfter(endLocalDate)) {
                        // 将startLocalDate转化为格式为yyyy-MM-dd格式字符串
                        String format1 = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                        String format1 = startLocalDate.format(DateTimeFormatter.ofPattern("d"));
                        x.put(format1,0);
                        x1.put(format1,0);
                        x2.put(format1,0);
@@ -285,15 +285,15 @@
                break;
        }
        if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
            List<LocalDate> localDates = generateDateList(homeDto.getTime());
            for (LocalDate localDate : localDates) {
                x.put(localDate+"",0);
                x1.put(localDate+"",0);
                x2.put(localDate+"",0);
            }
        }
//        if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
//            List<LocalDate> localDates = generateDateList(homeDto.getTime());
//            for (LocalDate localDate : localDates) {
//                x.put(localDate+"",0);
//                x1.put(localDate+"",0);
//                x2.put(localDate+"",0);
//            }
//
//        }
        for (Order order : data6) {
            int value = order.getCreateTime().getMonth().getValue();
            int value1 = order.getCreateTime().getDayOfMonth();