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 1/4] =?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 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 Date: Fri, 27 Sep 2024 15:09:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B0=88=E5=88=A4?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/project/common/EbpProjectCommonUtil.java | 1 + .../mall/ebtp/project/common/ProjectCommonUtil.java | 6 +++++- .../service/impl/ProjectRecordServiceImpl.java | 4 +++- 3 files changed, 9 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 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 Date: Sun, 29 Sep 2024 10:45:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E4=BE=A7=E6=96=B0=E9=87=87=E8=B4=AD=E6=96=B9=E5=BC=8F=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/common/EbpProjectCommonUtil.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 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 3fddfc5..4a9c256 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 货物 标的类型 @@ -233,11 +246,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_003, ProjectCommonUtil.PROCUREMENT_MODE_15);待定 + put(PURC_MODE_023, ProjectCommonUtil.PROCUREMENT_MODE_15); put(PURC_MODE_004, ProjectCommonUtil.PROCUREMENT_MODE_6); - //put(PURC_MODE_004, ProjectCommonUtil.PROCUREMENT_MODE_16);待定 + put(PURC_MODE_024, ProjectCommonUtil.PROCUREMENT_MODE_16); put(PURC_MODE_005, ProjectCommonUtil.PROCUREMENT_MODE_3); - //put(PURC_MODE_005, ProjectCommonUtil.PROCUREMENT_MODE_13);待定 + put(PURC_MODE_022, ProjectCommonUtil.PROCUREMENT_MODE_13); }}; /** From e80a1fc6c141d06d04fa72b039de6ee00776e4cb Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 2 Jan 2025 08:57:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AF=A2=E6=AF=94=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E4=B8=A4=E9=98=B6=E6=AE=B5=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/project/common/EbpProjectCommonUtil.java | 5 +++++ 1 file changed, 5 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 4a9c256..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 @@ -108,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 预审 @@ -271,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); }}; /**