feat(all): 配送明细报表

1 修改配送明细报表权限控制

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -485,15 +485,14 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 						throw new ServiceException("配送日期必选且时间不超过一个月");
 					}
 				} else {
-					throw new ServiceException("导出时配送日期必填");
-				}
-				if (ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) || ObjectUtil.isNotEmpty(query.getEndSjsigningTime())) {
-					boolean withinOneMonth = DateUtil.between(query.getStartSjsigningTime(), query.getEndSjsigningTime(), DateUnit.DAY) <= 30;
-					if (!withinOneMonth) {
-						throw new ServiceException("签收日期必选且时间不超过一个月");
+					if (ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) || ObjectUtil.isNotEmpty(query.getEndSjsigningTime())) {
+						boolean withinOneMonth = DateUtil.between(query.getStartSjsigningTime(), query.getEndSjsigningTime(), DateUnit.DAY) <= 30;
+						if (!withinOneMonth) {
+							throw new ServiceException("签收日期必选且时间不超过一个月");
+						}
+					} else {
+						throw new ServiceException("导出时配送日期必填");
 					}
-				} else {
-					throw new ServiceException("导出时签收日期必填");
 				}
 			}
 		} else {
@@ -506,16 +505,16 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 						throw new ServiceException("配送日期必选且时间不超过7天");
 					}
 				} else {
-					throw new ServiceException("导出时配送日期必填");
-				}
-				if (ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) || ObjectUtil.isNotEmpty(query.getEndSjsigningTime())) {
-					boolean withinOneMonth = DateUtil.between(query.getStartSjsigningTime(), query.getEndSjsigningTime(), DateUnit.DAY) <= 7;
-					if (!withinOneMonth) {
-						throw new ServiceException("签收日期必选且时间不超过7天 ");
+					if (ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) || ObjectUtil.isNotEmpty(query.getEndSjsigningTime())) {
+						boolean withinOneMonth = DateUtil.between(query.getStartSjsigningTime(), query.getEndSjsigningTime(), DateUnit.DAY) <= 7;
+						if (!withinOneMonth) {
+							throw new ServiceException("签收日期必选且时间不超过7天 ");
+						}
+					} else {
+						throw new ServiceException("导出时配送日期必填");
 					}
-				} else {
-					throw new ServiceException("导出时签收日期必填");
 				}
+
 			}
 		}
 		List<ReportDetailVO> detailsPage = reportDeliverMapeer.getDetailsPageV3(page, query);