From 1b6230312b3a1b1740c720f068d37fb9516274fe Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 25 Mar 2021 13:09:41 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8F=91=E5=B8=83=E6=89=8D=E8=83=BD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E6=A0=87=E6=AE=B5=E8=BF=87=E6=BB=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/project/common/ProjectCommonUtil.java | 2 +- .../project/projectsection/entity/ProjectSectionVO.java | 2 +- .../service/impl/ProjectSectionServiceImpl.java | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java index 61b6220..a2bd7fc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java @@ -494,7 +494,7 @@ public class ProjectCommonUtil { public static final int INQUIRY_NOTICE_STATUS_2 = 2; /** - * 异常处理标段是否被选中 1 否 + * 异常处理标段是否被选中 1 选中 */ public static final int IS_EXCEPTION_CHECK_1 = 1; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java index b993e25..906c755 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java @@ -31,7 +31,7 @@ public class ProjectSectionVO extends ProjectSection implements Serializable { private BasePageRequest basePageRequest; /** - * 是否被选中 0 是 1 否 + * 是否被选中 0 不选中 1 选中 */ @ApiModelProperty(value = "是否被选中 0 不选中 1 选中") private Integer isExceptionCheck; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index d476e35..055e9a6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -488,7 +488,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionVOList = projectSectionMapper.selectEditSectionBySave(projectId); - sectionVOList.stream().filter(n -> (n.getBusinessModule() > (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) + sectionVOList = sectionVOList.stream().filter(n -> (n.getBusinessModule() > (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) && n.getStatus() < ProjectCommonUtil.BUSINESS_MODULE_12)).collect(Collectors.toList()); return sectionVOList; } @@ -498,9 +498,10 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionVOList = projectSectionMapper.selectEditSectionByUpdate(projectId, exceptionId); - sectionVOList.stream().filter(n -> !(n.getIsExceptionCheck() == ProjectCommonUtil.IS_EXCEPTION_CHECK_1 - && (n.getBusinessModule() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) - && n.getBusinessModule() >= ProjectCommonUtil.BUSINESS_MODULE_12))).collect(Collectors.toList()); + sectionVOList = sectionVOList.stream().filter(n -> !( + n.getIsExceptionCheck() != ProjectCommonUtil.IS_EXCEPTION_CHECK_1 //不选中状态and(标段在发布之前的流程and归档流程) + && (n.getBusinessModule() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) && n.getBusinessModule() >= ProjectCommonUtil.BUSINESS_MODULE_12) + )).collect(Collectors.toList()); return sectionVOList; }