zh

src/main/java/com/zh/project0512/controller/manage/StatisticsController.java

@@ -66,6 +66,7 @@ public class StatisticsController {
     public Result data2(@Validated @RequestBody SSParam param) {
 
         QueryWrapper<Video> qw = new QueryWrapper<>();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         if (null != param.getDateCondition()) {
             LocalDateTime now = LocalDateTime.now();
             LocalDateTime before = null;
@@ -86,8 +87,8 @@ public class StatisticsController {
             }
             qw.between("creatAt", before, LocalDateTime.now());
         } else {
-            qw.ge(param.getBeginTime() != null, "date_format(creatAt, '%Y-%m-%d')", param.getBeginTime());
-            qw.le(param.getEndTime() != null, "date_format(creatAt, '%Y-%m-%d')", param.getEndTime());
+            qw.ge(param.getBeginTime() != null, "date_format(creatAt, '%Y-%m-%d')",  param.getBeginTime() != null?param.getBeginTime().format(df):null);
+            qw.le(param.getEndTime() != null, "date_format(creatAt, '%Y-%m-%d')", param.getEndTime() != null?param.getEndTime().format(df):null);
         }
         List<JSONObject> videoDataBydDay = adminMapper.statistics2(qw);
         ArrayList<JSONObject> res = new ArrayList<>();
@@ -96,7 +97,6 @@ public class StatisticsController {
         }
         JSONObject first = videoDataBydDay.get(0);
         JSONObject last = videoDataBydDay.get(videoDataBydDay.size() - 1);
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate dat = param.getBeginTime() == null ? LocalDate.parse((CharSequence) first.get("dat"), df) : param.getBeginTime().toLocalDate();
         LocalDate dat2 = param.getEndTime() == null ? LocalDate.parse((CharSequence) last.get("dat"), df) : param.getEndTime().toLocalDate();
         for (int i = 0; i <= ChronoUnit.DAYS.between(dat, dat2); i++) {