diff --git a/src/main/java/com/wms/controller/ExcelController.java b/src/main/java/com/wms/controller/ExcelController.java index ee20ea5..aa976d8 100644 --- a/src/main/java/com/wms/controller/ExcelController.java +++ b/src/main/java/com/wms/controller/ExcelController.java @@ -782,6 +782,7 @@ public class ExcelController { .like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId()); if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() != null) { workSummaryQueryWrapper.between(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate(), workSummaryQuery.getWorkEndDate()); + } if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() == null) { workSummaryQueryWrapper.eq(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate()); diff --git a/src/main/java/com/wms/controller/StockController.java b/src/main/java/com/wms/controller/StockController.java index 9bbf543..443f234 100644 --- a/src/main/java/com/wms/controller/StockController.java +++ b/src/main/java/com/wms/controller/StockController.java @@ -353,7 +353,15 @@ public class StockController { .like(StringUtils.isNotEmpty(stockUpdateRecordQuery.getVehicleId()), StockUpdateRecord::getVehicleId, stockUpdateRecordQuery.getVehicleId()) .like(StringUtils.isNotEmpty(stockUpdateRecordQuery.getGoodsId()), StockUpdateRecord::getGoodsId, stockUpdateRecordQuery.getGoodsId()) .orderByDesc(StockUpdateRecord::getUpdateTime); - if (stockUpdateRecordQuery.getUpdateTime() != null) { + if (stockUpdateRecordQuery.getUpdateTime() != null && stockUpdateRecordQuery.getUpdateEndTime() != null) { + if(stockUpdateRecordQuery.getUpdateEndTime().isBefore(stockUpdateRecordQuery.getUpdateTime())) { + response.setCode(ResponseCode.ERROR.getCode()); + response.setMessage("结束日期不能小于开始日期"); + return convertJsonString(response); + } + stockLambdaQueryWrapper.between(StockUpdateRecord::getUpdateTime, stockUpdateRecordQuery.getUpdateTime().toLocalDate().atStartOfDay(), stockUpdateRecordQuery.getUpdateEndTime().toLocalDate().plusDays(1).atStartOfDay().minusSeconds(1)); + } + if (stockUpdateRecordQuery.getUpdateTime() != null && stockUpdateRecordQuery.getUpdateEndTime() == null) { stockLambdaQueryWrapper.between(StockUpdateRecord::getUpdateTime, stockUpdateRecordQuery.getUpdateTime().toLocalDate().atStartOfDay(), stockUpdateRecordQuery.getUpdateTime().toLocalDate().plusDays(1).atStartOfDay().minusSeconds(1)); } Page recordsPage = stockUpdateRecordService.page(page, stockLambdaQueryWrapper); @@ -562,4 +570,4 @@ public class StockController { return convertJsonString(rsp); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/wms/entity/app/request/StockUpdateRecordQuery.java b/src/main/java/com/wms/entity/app/request/StockUpdateRecordQuery.java index b4c7b1f..840a13b 100644 --- a/src/main/java/com/wms/entity/app/request/StockUpdateRecordQuery.java +++ b/src/main/java/com/wms/entity/app/request/StockUpdateRecordQuery.java @@ -63,12 +63,21 @@ public class StockUpdateRecordQuery extends PageQuery { @JsonProperty("reason") private String reason; /** - * 更新时间 + * 更新时间 -- 开始时间 */ @JsonProperty("updateTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + + /** + * 更新时间 -- 结束时间 + */ + @JsonProperty("updateEndTime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateEndTime; + /** * 更新用户 */