每日账单赛选条件改为时间区间筛选

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

@@ -43,12 +43,20 @@ public class WaybillOrderReportQueryParam implements Serializable {
     private List<Long> dictIds;
 
     /**
-     * 时间
+     * 开始时间
      */
-    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
-    @Schema(description = "时间")
-    @NotNull(message = "时间不能为空")
-    private Date oneDayTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Schema(description = "开始时间")
+    @NotNull(message = "开始时间不能为空")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Schema(description = "结束时间")
+    @NotNull(message = "结束时间不能为空")
+    private Date entTime;
 
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -2049,11 +2049,7 @@ public class WaybillOrderService {
                 .collect(Collectors.toMap(KwtLogisticsOrderAddress::getLOrderId, Function.identity(), (x, y) -> x));
 
         // 6.门卫
-        //当天开始时间
-        Date startOfDay = DateUtils.getStartOfDay(param.getOneDayTime(), DateUtils.DATE_TIME_PATTERN);
-        //当天结算时间
-        Date endOfDay = DateUtils.getEndOfDay(param.getOneDayTime());
-        List<KwtGatekeeperWaybillOrder> gatekeepers = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(param.getEntId(), lOrderIds, Global.ADDRESS_LOAD, startOfDay, endOfDay);
+        List<KwtGatekeeperWaybillOrder> gatekeepers = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(param.getEntId(), lOrderIds, Global.ADDRESS_LOAD, param.getStartTime(), param.getEntTime());
         if (CollectionUtils.isEmpty(gatekeepers)) {
             return new ArrayList<>();
         }
@@ -2371,11 +2367,7 @@ public class WaybillOrderService {
                 .collect(Collectors.toMap(KwtLogisticsOrder::getId, Function.identity(), (x, y) -> x));
 
         // 3.门卫
-        //当天开始时间
-        Date startOfDay = DateUtils.getStartOfDay(param.getOneDayTime(), DateUtils.DATE_TIME_PATTERN);
-        //当天结算时间
-        Date endOfDay = DateUtils.getEndOfDay(param.getOneDayTime());
-        List<KwtGatekeeperWaybillOrder> gatekeepeSeconds = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(mockEntIds, lOrderIds, Global.ADDRESS_UNLOAD, startOfDay, endOfDay);
+        List<KwtGatekeeperWaybillOrder> gatekeepeSeconds = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(mockEntIds, lOrderIds, Global.ADDRESS_UNLOAD, param.getStartTime(), param.getEntTime());
         if (CollectionUtils.isEmpty(gatekeepeSeconds)) {
             return Collections.emptyList();
         }