订单列表时间范围查询处理

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/DateUtil.java

@@ -9,6 +9,7 @@ import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 
 /**
  * @description: 时间工具类
@@ -70,6 +71,7 @@ public class DateUtil {
 
     /**
      * yyyy-MM-dd 转换成 LocalDate
+     *
      * @param str
      * @return
      */
@@ -79,6 +81,7 @@ public class DateUtil {
 
     /**
      * yyyy-MM-dd 转换成 LocalDateTime
+     *
      * @param str
      * @return
      */
@@ -296,6 +299,13 @@ public class DateUtil {
         return calendar.getTime();
     }
 
+    public static Date offsetDay(Date date, int offset) {
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE, offset);
+        return calendar.getTime();
+    }
+
     public static String getWeekOfDate(Date date, Lanagues language) {
         String name = "";
         Calendar calendar = Calendar.getInstance();
@@ -305,7 +315,7 @@ public class DateUtil {
             weekIndex = 0;
         }
 
-        switch(language) {
+        switch (language) {
             case CHINESE:
                 name = Week.getName(weekIndex);
                 break;
@@ -317,7 +327,7 @@ public class DateUtil {
     }
 
     public static Date LocalDateTimeToDate(LocalDateTime localDateTime) {
-       return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+        return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
     }
 
     public static enum Week {
@@ -338,7 +348,7 @@ public class DateUtil {
             Week[] var2 = values();
             int var3 = var2.length;
 
-            for(int var4 = 0; var4 < var3; ++var4) {
+            for (int var4 = 0; var4 < var3; ++var4) {
                 Week week = var2[var4];
                 if (week.getIndex() == index) {
                     name = week.getName();
@@ -353,7 +363,7 @@ public class DateUtil {
             Week[] var2 = values();
             int var3 = var2.length;
 
-            for(int var4 = 0; var4 < var3; ++var4) {
+            for (int var4 = 0; var4 < var3; ++var4) {
                 Week week = var2[var4];
                 if (week.getIndex() == index) {
                     name = week.getEnName();

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -120,11 +120,12 @@ public class KwOrderService {
             andCriteria.and("supplyTopEntId").is(entId);
         }
         //日期范围
-        if (Objects.nonNull(params.getStartCreateTime())) {
+        if (Objects.nonNull(params.getStartCreateTime()) && Objects.nonNull(params.getEndCreateTime())) {
+            andCriteria.and("createTime").gte(params.getStartCreateTime()).lte(DateUtil.offsetDay(params.getEndCreateTime(), 1));
+        } else if (Objects.nonNull(params.getStartCreateTime())) {
             andCriteria.and("createTime").gte(params.getStartCreateTime());
-        }
-        if (Objects.nonNull(params.getEndCreateTime())) {
-            andCriteria.and("createTime").lte(params.getEndCreateTime());
+        } else if (Objects.nonNull(params.getEndCreateTime())) {
+            andCriteria.and("createTime").lte(DateUtil.offsetDay(params.getEndCreateTime(), 1));
         }
         //装卸货地址
         if (StringUtils.isNotBlank(params.getShippingAddressCode())) {
@@ -251,7 +252,8 @@ public class KwOrderService {
                     .setUnitPrice(String.valueOf(e.getUnitPrice())).setPrice(String.valueOf(e.getPrice()))
                     .setAmount(String.valueOf(e.getAmount())).setActualAmount(String.valueOf(e.getActualAmount()))
                     .setStartTime(Objects.isNull(e.getStartTime()) ? null : DateUtil.dateToStr(e.getStartTime()))
-                    .setAddedTime(Objects.isNull(e.getEndTime()) ? null : DateUtil.dateToStr(e.getEndTime()));
+                    .setAddedTime(Objects.isNull(e.getEndTime()) ? null : DateUtil.dateToStr(e.getEndTime()))
+                    .setCreateTime(DateUtil.getDateTime(e.getCreateTime()));
             list.add(export);
         });
         return list;

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/TradeOrderListStatisticParam.java

@@ -34,13 +34,13 @@ public class TradeOrderListStatisticParam {
     /**
      * 创建时间开始（yyyy-MM-dd）
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startCreateTime;
 
     /**
      * 创建时间结束（yyyy-MM-dd）
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endCreateTime;
 
     /**