From deaa30728353eb6bcab6967002c86f2151d90b46 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Thu, 26 Sep 2024 16:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E9=87=87=E8=B4=AD=20?=
 =?UTF-8?q?=E8=AF=A2=E6=AF=94=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/ebtp/project/common/EbpProjectCommonUtil.java     | 2 ++
 .../mall/ebtp/project/common/ProjectCommonUtil.java        | 6 +++++-
 .../service/impl/ProjectRecordServiceImpl.java             | 7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java
index aacc48f..8fd192f 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java
@@ -234,7 +234,9 @@ public class EbpProjectCommonUtil {
         put(PURC_MODE_002, ProjectCommonUtil.PROCUREMENT_MODE_2);
         put(PURC_MODE_003, ProjectCommonUtil.PROCUREMENT_MODE_5);
         put(PURC_MODE_004, ProjectCommonUtil.PROCUREMENT_MODE_6);
+        //put(PURC_MODE_004, ProjectCommonUtil.PROCUREMENT_MODE_16);待定
         put(PURC_MODE_005, ProjectCommonUtil.PROCUREMENT_MODE_3);
+        //put(PURC_MODE_005, ProjectCommonUtil.PROCUREMENT_MODE_13);待定
     }};
 
     /**
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 0d3cfd5..40d20bf 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
@@ -257,6 +257,8 @@ public class ProjectCommonUtil {
      * 项目采购方式 公开比选
      */
     public static final String PROCUREMENT_MODE_3 = "procurement_mode_3";
+    //询比采购
+    public static final String PROCUREMENT_MODE_13 = "procurement_mode_13";
 
     /**
      * 项目采购方式 公开招募
@@ -272,6 +274,8 @@ public class ProjectCommonUtil {
      * 项目采购方式 单一来源
      */
     public static final String PROCUREMENT_MODE_6 = "procurement_mode_6";
+    //直接采购
+    public static final String PROCUREMENT_MODE_16 = "procurement_mode_16";
 
     /**
      * 项目采购方式 公开询价
@@ -556,7 +560,7 @@ public class ProjectCommonUtil {
     public static final Map<String,String[]> PROCUREMENT_MODE_MAP = new HashMap<String,String[]>(){{
         String[] biddingArray = {PROCUREMENT_MODE_1,PROCUREMENT_MODE_2};
         String[] recruitArray = {PROCUREMENT_MODE_4};
-        String[] negotiationArray = {PROCUREMENT_MODE_5,PROCUREMENT_MODE_6};
+        String[] negotiationArray = {PROCUREMENT_MODE_5,PROCUREMENT_MODE_6,PROCUREMENT_MODE_16};
         //招标
         this.put("01",biddingArray);
         //招募
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
index 4b229fe..36238ee 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
@@ -474,6 +474,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             case ProjectCommonUtil.PROCUREMENT_MODE_5:isInvitation = StringUtils.equals(projectRecord.getExaminationMethodDict(),ProjectCommonUtil.PARTAKE_TYPE_1);break;
             //单一来源
             case ProjectCommonUtil.PROCUREMENT_MODE_6:isInvitation = !StringUtils.equals(projectRecord.getIsApproval(),ProjectCommonUtil.IS_APPROVAL_1);break;
+            case ProjectCommonUtil.PROCUREMENT_MODE_16:isInvitation = !StringUtils.equals(projectRecord.getIsApproval(),ProjectCommonUtil.IS_APPROVAL_1);break;
             //邀请招标
             case ProjectCommonUtil.PROCUREMENT_MODE_2:
             //询价
@@ -697,6 +698,9 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
         if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_3)){
             record.setBiddingSignDict(EbpProjectCommonUtil.SELECTION_METHOD_MAP.get(purpBaseInfoVO.getProjBaseInfoVO().getComparSelectMode()));
         }
+        if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_13)){
+            record.setBiddingSignDict(EbpProjectCommonUtil.SELECTION_METHOD_MAP.get(purpBaseInfoVO.getProjBaseInfoVO().getComparSelectMode()));
+        }
 
         String[] isBidMethodList = {ProjectCommonUtil.PROCUREMENT_MODE_1,ProjectCommonUtil.PROCUREMENT_MODE_2};
         if(Arrays.asList(isBidMethodList).contains(projectEntrust.getProcurementMode())){
@@ -710,7 +714,8 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             record.setExaminationMethodDict(EbpProjectCommonUtil.RECRUITMENT_METHOD_MAP.get(purpBaseInfoVO.getProjBaseInfoVO().getReviewNum()));
         }else if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_1)
             ||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_2)
-            ||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_3)){
+            ||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_3)
+            ||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_13)){
             //资审方式 字典
             record.setExaminationMethodDict(EbpProjectCommonUtil.EXAMINATION_METHOD_MAP.get(purpBaseInfoVO.getProjBaseInfoVO().getSuppQualify()));
         }else if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_5)){