From e9a25210a514494a139351c3404220640593bde5 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Wed, 24 Feb 2021 14:45:34 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E4=B8=8D?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=202=E3=80=81=E5=A2=9E=E5=8A=A0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=A7=94=E6=89=98=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=82=80=E8=AF=B7=E6=8B=9B=E6=A0=87=E5=90=8E=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/ebtp/project/common/ProjectExceptionEnum.java      | 2 ++
 .../service/impl/ProjectEntrustServiceImpl.java             | 6 ++++++
 .../service/impl/ProjectExceptionServiceImpl.java           | 6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java
index e16ff01..bd9651b 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java
@@ -157,6 +157,8 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert {
     FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CODE_EMPTY(110069,"询价应答格式列表数据中类别编码不能为空"),
 
     FRAME_EXCEPTION_PROJECT_ENTRUST_PURP_IMPLEMENT_NO_EMPTY(110070, "项目委托信息实施项目编号不能为空！"),
+
+    FRAME_EXCEPTION_PROJECT_ENTRUST_SUPP_QUALIFY_ERROR(110071, "邀请招标资审方式应为后审方式！"),
     ;
 
     /**
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
index 5047b94..1aea729 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
@@ -591,6 +591,12 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
                    ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_SUPP_QUALIFY_EMPTY.throwException();
                }
 
+               //招标邀请资审方式必须为后审
+               if(StringUtils.equals(purpBaseInfo.getProjBaseInfoVO().getPurcMode(),EbpProjectCommonUtil.PURC_MODE_002) &&
+                       !StringUtils.equals(purpBaseInfo.getProjBaseInfoVO().getSuppQualify(),EbpProjectCommonUtil.SUPP_QUALIFY_002)){
+                   ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_SUPP_QUALIFY_ERROR.throwException();
+               }
+
                //比选方式 字典
                if(StringUtils.equals(purpBaseInfo.getProjBaseInfoVO().getPurcMode(),EbpProjectCommonUtil.PURC_MODE_005)
                        && StringUtils.isEmpty(purpBaseInfo.getProjBaseInfoVO().getComparSelectMode())){
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
index c8f6e2e..668d9f8 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
@@ -182,12 +182,12 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
         projectSectionVO.setProjectId(projectException.getProjectId());
         List<ProjectSection> sectionList =  projectSectionService.getList(projectSectionVO);
 
-        /*标段是否全部废止状态*/
-        long isAllAbolish = sectionList.stream().filter(n -> n.getStatus() != ProjectCommonUtil.SECTION_STATUS_9).count();
-
         //提取异常标段ID
         List<String> sectionExceptionIds = sectionExceptionList.stream().map(ProjectSectionException::getSectionId).collect(Collectors.toList());
 
+        /*标段是否全部废止状态*/
+        long isAllAbolish = sectionList.stream().filter(n -> !sectionExceptionIds.contains(n.getId())).count();
+
         //获取异常标段信息
         sectionList = sectionList.stream().filter(n -> sectionExceptionIds.contains(n.getId())).collect(Collectors.toList());