From 2cd8f470bf0c1e4090a867b77bb9e22fe8db6520 Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Mon, 20 Jan 2025 10:02:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E9=87=87=E8=B4=AD-=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/project/common/ProjectCommonUtil.java  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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..db7425b 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,10 @@ 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 +276,10 @@ public class ProjectCommonUtil {
      * 项目采购方式 单一来源
      */
     public static final String PROCUREMENT_MODE_6 = "procurement_mode_6";
+    /**
+     * 项目采购方式 直采
+     */
+    public static final String PROCUREMENT_MODE_16 = "procurement_mode_16";
 
     /**
      * 项目采购方式 公开询价
@@ -555,12 +563,13 @@ public class ProjectCommonUtil {
 
     public static final Map<String,String[]> PROCUREMENT_MODE_MAP = new HashMap<String,String[]>(){{
         String[] biddingArray = {PROCUREMENT_MODE_1,PROCUREMENT_MODE_2};
-        String[] recruitArray = {PROCUREMENT_MODE_4};
-        String[] negotiationArray = {PROCUREMENT_MODE_5,PROCUREMENT_MODE_6};
+//        String[] recruitArray = {PROCUREMENT_MODE_4};
+        String[] xbArray = {PROCUREMENT_MODE_13};
+        String[] negotiationArray = {PROCUREMENT_MODE_16};
         //招标
         this.put("01",biddingArray);
-        //招募
-        this.put("03",recruitArray);
+        //询比
+        this.put("03",xbArray);
         //谈判
         this.put("04",negotiationArray);
     }};

From 8783981d9ba3614347d839d46beba8e519840064 Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Mon, 20 Jan 2025 10:42:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E9=87=87=E8=B4=AD-=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/projectrecord/dao/mapper/ProjectRecordMapper.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml
index e2ae28a..6016218 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml
@@ -116,6 +116,7 @@
                 from biz_project_record
                 where date_format(create_date, '%Y%m') = #{vo.selectDate}
                   and app_manager_id = #{vo.appManagerId}
+                  and bid_method_dict in ('procurement_mode_1','procurement_mode_2','procurement_mode_13','procurement_mode_5','procurement_mode_16')
                 GROUP BY bid_method_dict ORDER BY bid_method_dict
         </select>
 </mapper>
\ No newline at end of file

From 596bdba9a8c33fea660f2da8829120261950d6fa Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Wed, 12 Feb 2025 16:19:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E9=87=87=E8=B4=AD-=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/ProjectRecordMapper.xml           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml
index 6016218..ec08b6c 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml
@@ -111,12 +111,14 @@
                 delete from biz_project_record where id = #{id}
         </delete>
         <select id="getUserProjectRecordCount" parameterType="com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO" resultType="java.util.Map">
-                SELECT bid_method_dict as bidMethodDict,
-                count(id) projectCount
-                from biz_project_record
-                where date_format(create_date, '%Y%m') = #{vo.selectDate}
-                  and app_manager_id = #{vo.appManagerId}
-                  and bid_method_dict in ('procurement_mode_1','procurement_mode_2','procurement_mode_13','procurement_mode_5','procurement_mode_16')
-                GROUP BY bid_method_dict ORDER BY bid_method_dict
+                SELECT dict.code as bidMethodDict,
+                count(xm.id) projectCount
+                from dict_project dict
+				LEFT JOIN
+				(
+				    SELECT bid_method_dict,id  from biz_project_record where  date_format(create_date, '%Y%m') = #{vo.selectDate} and app_manager_id = #{vo.appManagerId}
+				) xm ON  dict.code= xm.bid_method_dict
+				where dict.code in ('procurement_mode_1','procurement_mode_2','procurement_mode_13','procurement_mode_5','procurement_mode_16')
+                GROUP BY dict.code ORDER BY dict.code;
         </select>
 </mapper>
\ No newline at end of file