From 6eede45386e0f793f038b551da8453cf33559cef Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Mon, 12 Apr 2021 16:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=9B=E6=A0=87=E6=96=B9=E5=BC=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/common/EbpProjectCommonUtil.java    | 17 +++++++++++++++++
 .../ebtp/project/common/ProjectCommonUtil.java  | 10 ++++++++++
 .../project/common/ProjectExceptionEnum.java    |  2 ++
 .../entity/ebpentity/ProjBaseInfoVO.java        |  3 +++
 .../service/impl/ProjectEntrustServiceImpl.java |  7 +++++++
 .../service/impl/ProjectRecordServiceImpl.java  |  6 ++++++
 6 files changed, 45 insertions(+)

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 07eb03e..e817e00 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
@@ -195,6 +195,16 @@ public class EbpProjectCommonUtil {
      */
     public static final String  FAIL_STATUS_004 = "004";
 
+    /**
+     * 招标方式 依法必须招标
+     */
+    public static final String BID_METHOD_001 = "001";
+
+    /**
+     * 招标方式 自愿招标
+     */
+    public static final String BID_METHOD_002 = "002";
+
     /**
      * 组织形式转换 MAP
      */
@@ -282,6 +292,13 @@ public class EbpProjectCommonUtil {
         put(ProjectCommonUtil.EXCEPTION_DESC_4,FAIL_STATUS_004);
     }};
 
+    /**
+     * 招标方式转换 MAP
+     */
+    public static Map<String,String> BID_METHOD_MAP = new HashMap<String,String>(){{
+        put(BID_METHOD_001,ProjectCommonUtil.OPEN_TENDER_FORM_1);
+        put(BID_METHOD_002,ProjectCommonUtil.OPEN_TENDER_FORM_2);
+    }};
 
     /**
      * 获取map的key
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 7b09519..f411f51 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
@@ -538,6 +538,16 @@ public class ProjectCommonUtil {
      */
     public static final String SUPPLIER_TYPE_0 = "0";
 
+    /**
+     * 公开招标招标形式 依法必招
+     */
+    public static final String OPEN_TENDER_FORM_1 = "open_tender_form_1";
+
+    /**
+     * 公开招标招标形式 自愿招标
+     */
+    public static final String OPEN_TENDER_FORM_2 = "open_tender_form_2";
+
     public static Map<String,String[]> PROCUREMENT_MODE_MAP = new HashMap<String,String[]>(){{
         String[] biddingArray = {PROCUREMENT_MODE_1,PROCUREMENT_MODE_2};
         String[] recruitArray = {PROCUREMENT_MODE_4};
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 68ba062..0f8ed2d 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
@@ -169,6 +169,8 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert {
     FRAME_EXCEPTION_PROJECT_SUPP_REL_VO_LIST_EMPTY(110075, "供应商ID不能为空！"),
 
     FRAME_EXCEPTION_PROJECT_CHECK_STATUS_ERROR(110079, "调用采购系统校验是否可以发起接口错误"),
+
+    FRAME_EXCEPTION_PROJECT_ENTRUST_BID_METHOD_ERROR(110080, "项目委托单招标方式不能为空"),
     ;
 
     /**
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java
index 099f8ef..168ba3a 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java
@@ -183,6 +183,9 @@ public class ProjBaseInfoVO{
     @ApiModelProperty(value = "版本升级原因说明")
     private String upgradeReason;
 
+    @ApiModelProperty(value = "招标方式")
+    private String bidMethod;
+
     @ApiModelProperty(value = "招标失败")
     private String isBidFail;
 
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 051cdb1..3ff1789 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
@@ -618,6 +618,13 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
                    ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_SUPP_QUALIFY_ERROR.throwException();
                }
 
+               //当招标项目  招标方式 不能为空 bidMethod 依法必须招标  自愿招标
+               String[] isBidMethodList = {EbpProjectCommonUtil.PURC_MODE_001,EbpProjectCommonUtil.PURC_MODE_002};
+               if(Arrays.asList(isBidMethodList).contains(purpBaseInfo.getProjBaseInfoVO().getPurcMode())
+                       && StringUtils.isEmpty(purpBaseInfo.getProjBaseInfoVO().getBidMethod())){
+                   ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_BID_METHOD_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/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
index be539aa..4e5f199 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
@@ -633,6 +633,12 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             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())){
+            record.setOpenTenderForm(EbpProjectCommonUtil.BID_METHOD_MAP.get(purpBaseInfoVO.getProjBaseInfoVO().getBidMethod()));
+        }
+
+
         //如果采购方式是招募方式 评审方法字段存入评审次数字典值
         if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_4)){
             //评审次数 字典