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 8fd192f..3fddfc5 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 @@ -233,6 +233,7 @@ public class EbpProjectCommonUtil { put(PURC_MODE_001, ProjectCommonUtil.PROCUREMENT_MODE_1); put(PURC_MODE_002, ProjectCommonUtil.PROCUREMENT_MODE_2); put(PURC_MODE_003, ProjectCommonUtil.PROCUREMENT_MODE_5); + //put(PURC_MODE_003, ProjectCommonUtil.PROCUREMENT_MODE_15);待定 put(PURC_MODE_004, ProjectCommonUtil.PROCUREMENT_MODE_6); //put(PURC_MODE_004, ProjectCommonUtil.PROCUREMENT_MODE_16);待定 put(PURC_MODE_005, ProjectCommonUtil.PROCUREMENT_MODE_3); 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 40d20bf..2706115 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 @@ -269,6 +269,10 @@ public class ProjectCommonUtil { * 项目采购方式 竞争性谈判 */ public static final String PROCUREMENT_MODE_5 = "procurement_mode_5"; + /** + * 谈判 + */ + public static final String PROCUREMENT_MODE_15 = "procurement_mode_15"; /** * 项目采购方式 单一来源 @@ -560,7 +564,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,PROCUREMENT_MODE_16}; + String[] negotiationArray = {PROCUREMENT_MODE_5,PROCUREMENT_MODE_15,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 36238ee..f9ce08c 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 @@ -472,6 +472,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl