diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 42a23782e..3802e9373 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -6080,8 +6080,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailsPage(ReportDetailVO vo, DevilerDetailsQuery query) { // 添加时间校验 - if(ReportUtil.areAllPropertiesEmpty(vo)){ - if (ObjectUtil.isEmpty(query.getStartTaskTime()) && ObjectUtil.isEmpty(query.getEndTaskTime()) && ObjectUtil.isEmpty(query.getStartSjsigningTime()) && ObjectUtil.isEmpty(query.getEndSjsigningTime())) { - throw new ServiceException("配送日期和签收日期必须要填一个"); - } - if (ObjectUtil.isNotEmpty(query.getStartTaskTime()) && ObjectUtil.isNotEmpty(query.getEndTaskTime())) { - ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期"); - } - if(ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) && ObjectUtil.isNotEmpty(query.getEndSjsigningTime())){ - ReportUtil.dateIsWithinOneMonth(null, query.getStartSjsigningTime(), query.getEndSjsigningTime(), "签收日期"); - } - } + checkDetailDate(vo, query); Integer current = query.getCurrent(); Integer size = query.getSize(); IPage page = Condition.getPage(query); @@ -334,8 +324,20 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { @Override public void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) { + checkDetailDate(vo, query); + QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class); + detailsCustomQuery(query, queryWrapper); + // 仓库权限 + ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient); + reportExcelUtil.export(response, deliveryDetailReader, ReportDetailVO.class, queryWrapper, "配送明细报表"); + } + + private static void checkDetailDate(ReportDetailVO vo, DevilerDetailsQuery query) { // 添加时间校验 if(ReportUtil.areAllPropertiesEmpty(vo)){ + if (ObjectUtil.isEmpty(query.getStartTaskTime()) && ObjectUtil.isEmpty(query.getEndTaskTime()) && ObjectUtil.isEmpty(query.getStartSjsigningTime()) && ObjectUtil.isEmpty(query.getEndSjsigningTime())) { + throw new ServiceException("配送日期和签收日期必须要填一个"); + } if (ObjectUtil.isNotEmpty(query.getStartTaskTime()) && ObjectUtil.isNotEmpty(query.getEndTaskTime())) { ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期"); } @@ -343,11 +345,6 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { ReportUtil.dateIsWithinOneMonth(null, query.getStartSjsigningTime(), query.getEndSjsigningTime(), "签收日期"); } } - QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class); - detailsCustomQuery(query, queryWrapper); - // 仓库权限 - ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient); - reportExcelUtil.export(response, deliveryDetailReader, ReportDetailVO.class, queryWrapper, "配送明细报表"); } @Override