update 增加运营端运单查询装卸时间条件

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/ManagementWaybillOrderQuery.java

@@ -60,6 +60,30 @@ public class ManagementWaybillOrderQuery extends PageRequest implements Serializ
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endEndTime;
 
+    /**
+     * 装载开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startLoadTime;
+
+    /**
+     * 装载结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endLoadTime;
+
+    /**
+     * 卸载开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startUnloadTime;
+
+    /**
+     * 卸载结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endUnloadTime;
+
     /**
      * 关键字搜索
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ManagementWaybillOrderService.java

@@ -93,6 +93,25 @@ public class ManagementWaybillOrderService {
         } else if (Objects.nonNull(query.getEndEndTime())) {
             criteria.and("endTime").lte(DateUtil.offsetDay(query.getEndEndTime(), 1));
         }
+
+        // 装载时间
+        if (Objects.nonNull(query.getStartLoadTime()) && Objects.nonNull(query.getEndLoadTime())) {
+            criteria.and("loadTime").gte(query.getStartLoadTime()).lte(DateUtil.offsetDay(query.getEndLoadTime(), 1));
+        } else if (Objects.nonNull(query.getStartLoadTime())) {
+            criteria.and("loadTime").gte(query.getStartLoadTime());
+        } else if (Objects.nonNull(query.getEndLoadTime())) {
+            criteria.and("loadTime").lte(DateUtil.offsetDay(query.getEndLoadTime(), 1));
+        }
+
+        // 卸货时间
+        if (Objects.nonNull(query.getStartUnloadTime()) && Objects.nonNull(query.getEndUnloadTime())) {
+            criteria.and("unloadTime").gte(query.getStartUnloadTime()).lte(DateUtil.offsetDay(query.getEndUnloadTime(), 1));
+        } else if (Objects.nonNull(query.getStartUnloadTime())) {
+            criteria.and("unloadTime").gte(query.getStartUnloadTime());
+        } else if (Objects.nonNull(query.getEndUnloadTime())) {
+            criteria.and("unloadTime").lte(DateUtil.offsetDay(query.getEndUnloadTime(), 1));
+        }
+
         // 多条件模糊查询
         List<Criteria> orCriteria = new ArrayList<>();
         if (StringUtils.isNotBlank(query.getKeywords())) {