diff --git a/src/main/java/com/wms/controller/ExcelController.java b/src/main/java/com/wms/controller/ExcelController.java index 81f4a42..ee20ea5 100644 --- a/src/main/java/com/wms/controller/ExcelController.java +++ b/src/main/java/com/wms/controller/ExcelController.java @@ -764,7 +764,7 @@ public class ExcelController { @PostMapping("/downloadWorkSummaryExcel") @ResponseBody public void downloadWorkSummaryExcel(@RequestBody WorkSummaryQuery workSummaryQuery, HttpServletResponse response) throws IOException { - logger.info("导出物料报表,筛选参数:{},请求ip:{}", convertJsonString(workSummaryQuery), getIpAddr(servletRequest)); + logger.info("导出工作总结,筛选参数:{},请求ip:{}", convertJsonString(workSummaryQuery), getIpAddr(servletRequest)); //设置响应格式 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); @@ -774,13 +774,19 @@ public class ExcelController { // 内容样式 HorizontalCellStyleStrategy horizontalCellStyleStrategy = ExcelContentStyle.getContentStyle(); // 查询参数 - List goodsList = workSummaryService.list(new LambdaQueryWrapper() + var workSummaryQueryWrapper = new LambdaQueryWrapper() .eq(workSummaryQuery.getLackStatus() != null, WorkSummary::getLackStatus, workSummaryQuery.getLackStatus()) - .eq(workSummaryQuery.getWorkDate() != null, WorkSummary::getWorkDate, workSummaryQuery.getWorkDate()) .like(StringUtils.isNotEmpty(workSummaryQuery.getWorkStation()), WorkSummary::getWorkStation, workSummaryQuery.getWorkStation()) .like(StringUtils.isNotEmpty(workSummaryQuery.getWorkOrder()), WorkSummary::getWorkOrder, workSummaryQuery.getWorkOrder()) .like(StringUtils.isNotEmpty(workSummaryQuery.getWorkCenter()), WorkSummary::getWorkCenter, workSummaryQuery.getWorkCenter()) - .like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId())); + .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()); + } + List goodsList = workSummaryService.list(workSummaryQueryWrapper); EasyExcel.write(response.getOutputStream(), WorkSummaryExcelVo.class) .excelType(ExcelTypeEnum.XLSX) .registerWriteHandler(horizontalCellStyleStrategy) @@ -817,4 +823,4 @@ public class ExcelController { .sheet("库位报表") .doWrite(locations.stream().map(LocationExcelVo::of).toList()); } -} \ No newline at end of file +} diff --git a/src/main/java/com/wms/controller/KateWorkQueryController.java b/src/main/java/com/wms/controller/KateWorkQueryController.java index 9f2bc95..b0957e1 100644 --- a/src/main/java/com/wms/controller/KateWorkQueryController.java +++ b/src/main/java/com/wms/controller/KateWorkQueryController.java @@ -773,14 +773,20 @@ public class KateWorkQueryController { logger.info("接收到查询工作总结请求:{},请求ip:{}", convertJsonString(workSummaryQuery), HttpUtils.getIpAddr(servletRequest)); ResponseEntity response = new ResponseEntity(); try { - Page page = workSummaryQuery.toMpPage(); - Page workSummaryPage = workSummaryService.page(page, new LambdaQueryWrapper() + var workSummaryQueryWrapper = new LambdaQueryWrapper() .eq(workSummaryQuery.getLackStatus() != null, WorkSummary::getLackStatus, workSummaryQuery.getLackStatus()) - .eq(workSummaryQuery.getWorkDate() != null, WorkSummary::getWorkDate, workSummaryQuery.getWorkDate()) .like(StringUtils.isNotEmpty(workSummaryQuery.getWorkStation()), WorkSummary::getWorkStation, workSummaryQuery.getWorkStation()) .like(StringUtils.isNotEmpty(workSummaryQuery.getWorkOrder()), WorkSummary::getWorkOrder, workSummaryQuery.getWorkOrder()) .like(StringUtils.isNotEmpty(workSummaryQuery.getWorkCenter()), WorkSummary::getWorkCenter, workSummaryQuery.getWorkCenter()) - .like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId())); + .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()); + } + Page page = workSummaryQuery.toMpPage(); + Page workSummaryPage = workSummaryService.page(page, workSummaryQueryWrapper); PageDto pageDto = PageDto.of(workSummaryPage, workSummary -> BeanUtil.copyProperties(workSummary, WorkSummaryVo.class)); logger.info("查询工作总结成功。"); response.setCode(ResponseCode.OK.getCode()); @@ -883,4 +889,4 @@ public class KateWorkQueryController { return convertJsonString(response); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/wms/entity/app/request/WorkSummaryQuery.java b/src/main/java/com/wms/entity/app/request/WorkSummaryQuery.java index 6284601..9c21bdd 100644 --- a/src/main/java/com/wms/entity/app/request/WorkSummaryQuery.java +++ b/src/main/java/com/wms/entity/app/request/WorkSummaryQuery.java @@ -56,12 +56,20 @@ public class WorkSummaryQuery extends PageQuery { @JsonProperty("lackNum") private BigDecimal lackNum; /** - * 工作日期 + * 工作日期 - 起始日期 */ @JsonProperty("workDate") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime workDate; + + /** + * 工作日期 - 结束日期 + */ + @JsonProperty("workEndDate") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime workEndDate; /** * 工作状态 * 0:未开始