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..07408cf 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 @@ -51,20 +51,33 @@ public class EbpProjectCommonUtil { */ public static final String PURC_MODE_002 = "002"; + /** * 采购方式 003 竞争性谈判 */ public static final String PURC_MODE_003 = "003"; + /** + * 谈判采购 + */ + public static final String PURC_MODE_023 = "023"; /** * 采购方式 004 单一来源采购 */ public static final String PURC_MODE_004 = "004"; + /** + * 直接采购 + */ + public static final String PURC_MODE_024 = "024"; /** * 采购方式 005 公开比选 */ public static final String PURC_MODE_005 = "005"; + /** + * 022询比采购 + */ + public static final String PURC_MODE_022 = "022"; /** * 001 货物 标的类型 @@ -95,6 +108,10 @@ public class EbpProjectCommonUtil { * 比选方式 002 多阶段评审 */ public static final String COMPAR_SELECT_MODE_002 = "002"; + /** + * 询比采购使用的比方方式 003 两阶段 ->selection_method_2 + */ + public static final String COMPAR_SELECT_MODE_003 = "003"; /** * 资审方式 001 预审 @@ -233,8 +250,11 @@ 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_023, ProjectCommonUtil.PROCUREMENT_MODE_15); put(PURC_MODE_004, ProjectCommonUtil.PROCUREMENT_MODE_6); + put(PURC_MODE_024, ProjectCommonUtil.PROCUREMENT_MODE_16); put(PURC_MODE_005, ProjectCommonUtil.PROCUREMENT_MODE_3); + put(PURC_MODE_022, ProjectCommonUtil.PROCUREMENT_MODE_13); }}; /** @@ -255,6 +275,7 @@ public class EbpProjectCommonUtil { public static final Map SELECTION_METHOD_MAP = new HashMap() {{ put(COMPAR_SELECT_MODE_001, ProjectCommonUtil.SELECTION_METHOD_1); put(COMPAR_SELECT_MODE_002, ProjectCommonUtil.SELECTION_METHOD_2); + put(COMPAR_SELECT_MODE_003, ProjectCommonUtil.SELECTION_METHOD_2); }}; /** 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..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 @@ -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"; /** * 项目采购方式 公开招募 @@ -267,11 +269,17 @@ public class ProjectCommonUtil { * 项目采购方式 竞争性谈判 */ public static final String PROCUREMENT_MODE_5 = "procurement_mode_5"; + /** + * 谈判 + */ + public static final String PROCUREMENT_MODE_15 = "procurement_mode_15"; /** * 项目采购方式 单一来源 */ public static final String PROCUREMENT_MODE_6 = "procurement_mode_6"; + //直接采购 + public static final String PROCUREMENT_MODE_16 = "procurement_mode_16"; /** * 项目采购方式 公开询价 @@ -556,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}; + 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 d9a4640..4474f52 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,8 +474,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl