Просмотр исходного кода

每日账单时间查询字段调整

donglang 19 часов назад
Родитель
Сommit
2f04fb67f8

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

@@ -56,7 +56,7 @@ public class WaybillOrderReportQueryParam implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(description = "结束时间")
     @NotNull(message = "结束时间不能为空")
-    private Date entTime;
+    private Date endTime;
 
 
 }

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

@@ -2049,7 +2049,7 @@ public class WaybillOrderService {
                 .collect(Collectors.toMap(KwtLogisticsOrderAddress::getLOrderId, Function.identity(), (x, y) -> x));
 
         // 6.门卫
-        List<KwtGatekeeperWaybillOrder> gatekeepers = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(param.getEntId(), lOrderIds, Global.ADDRESS_LOAD, param.getStartTime(), param.getEntTime());
+        List<KwtGatekeeperWaybillOrder> gatekeepers = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(param.getEntId(), lOrderIds, Global.ADDRESS_LOAD, param.getStartTime(), param.getEndTime());
         if (CollectionUtils.isEmpty(gatekeepers)) {
             return new ArrayList<>();
         }
@@ -2407,7 +2407,7 @@ public class WaybillOrderService {
                 .collect(Collectors.toMap(KwtLogisticsOrder::getId, Function.identity(), (x, y) -> x));
 
         // 3.门卫
-        List<KwtGatekeeperWaybillOrder> gatekeepeSeconds = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(mockEntIds, lOrderIds, Global.ADDRESS_UNLOAD, param.getStartTime(), param.getEntTime());
+        List<KwtGatekeeperWaybillOrder> gatekeepeSeconds = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(mockEntIds, lOrderIds, Global.ADDRESS_UNLOAD, param.getStartTime(), param.getEndTime());
         if (CollectionUtils.isEmpty(gatekeepeSeconds)) {
             return Collections.emptyList();
         }