From 15d2a516c01f750e5067d8f2b7765cd122a99ad7 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 13 Nov 2024 09:50:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改配送明细报表权限控制 --- .../impl/ReportDeliverServiceImpl.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index 6191dba4c..907bc4462 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/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 detailsPage = reportDeliverMapeer.getDetailsPageV3(page, query);