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 PROCUREMENT_MODE_MAP = new HashMap(){{ 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