From 266d528c0a883ceb8ffd537b9690a07e5053367a Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 25 Mar 2021 12:30:52 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=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=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectsection/dao/mapper/ProjectSectionMapper.xml | 3 +++ .../service/impl/ProjectSectionServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml index d78f4b4..a622ef4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml @@ -144,6 +144,7 @@ select t.id, t.bid_sect_name as bidSectName, t.bid_sect_biz_num as bidSectBizNum, + t.business_module as businessModule, t.status as status from biz_project_section t where t.project_id = ${projectId} @@ -156,6 +157,7 @@ (case when e.id is not null then '1' else '0' end) as isExceptionCheck, t.bid_sect_name as bidSectName, t.bid_sect_biz_num as bidSectBizNum, + t.business_module as businessModule, t.status as status from biz_project_section t left join biz_project_section_exception e on e.section_id = t.id and e.exception_id = ${exceptionId} @@ -170,6 +172,7 @@ select t.id, t.bid_sect_name as bidSectName, t.bid_sect_biz_num as bidSectBizNum, + t.business_module as businessModule, t.status as status from biz_project_section t,biz_project_section_exception e where e.section_id = t.id 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 661ca6c..d476e35 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.getStatus() > (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) + 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; } @@ -499,8 +499,8 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionVOList = projectSectionMapper.selectEditSectionByUpdate(projectId, exceptionId); sectionVOList.stream().filter(n -> !(n.getIsExceptionCheck() == ProjectCommonUtil.IS_EXCEPTION_CHECK_1 - && (n.getStatus() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) - && n.getStatus() >= ProjectCommonUtil.BUSINESS_MODULE_12))).collect(Collectors.toList()); + && (n.getBusinessModule() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) + && n.getBusinessModule() >= ProjectCommonUtil.BUSINESS_MODULE_12))).collect(Collectors.toList()); return sectionVOList; }