From 982f01231b1ce7414410d922830cb7f2d7b7398f Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Wed, 21 Aug 2024 18:07:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bracelet/mapper/BaseProjectMapper.java      |  2 ++
 .../service/impl/BaseProjectServiceImpl.java    |  2 ++
 .../mapper/bracelet/BaseProjectMapper.xml       | 17 +++++++++++++----
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BaseProjectMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BaseProjectMapper.java
index e4c8691..ba99db4 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BaseProjectMapper.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BaseProjectMapper.java
@@ -77,5 +77,7 @@ public interface BaseProjectMapper
      */
     public List<BaseProject> getProjectSomeLists(int[] ids);
 
+    public int getAppCount(int projectId);
 
+    public int getProCount(int projectId);
 }
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BaseProjectServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BaseProjectServiceImpl.java
index fdedac4..eb29e41 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BaseProjectServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BaseProjectServiceImpl.java
@@ -74,6 +74,8 @@ public class BaseProjectServiceImpl implements IBaseProjectService
             list = projectMapper.selectProjectList(project);
             for (BaseProject vo : list) {
                 vo.setContactInformation(Sm4Utils.decode(vo.getContactInformation()));
+                vo.setAppnum(projectMapper.getAppCount(vo.getProjectId()));
+                vo.setPronum(projectMapper.getProCount(project.getProjectId()));
             }
         } catch (Exception e) {
             log.error("查询人员列表", e);
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
index b591dbd..273190c 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
@@ -20,10 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<select id="selectProjectList" parameterType="com.bonus.common.entity.bracelet.vo.BaseProject" resultMap="BaseProjectResult">
-		select a.id, depart_name, head_name, contact_information,count(b.source_id) as appnum, remarks,a.create_user,a.update_user,count(tp.id) as pronum
+		select a.id, depart_name, head_name, contact_information, remarks,a.create_user,a.update_user
 		from tb_project_depart a
-		left join sys_file_source b on a.id = b.source_id and b.source_type = 5 and b.del_flag = 0
-		left join tb_project tp on a.id = tp.depart_id and tp.del_flag = 0
 		<where>
 			a.del_flag = 0
 			<if test="projectDepartName != null and projectDepartName != ''">
@@ -33,7 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			and	INSTR(head_name,#{projectHeadName}) > 0
 			</if>
 		</where>
-		group by a.id
 	</select>
 
 	<select id="selectProjectById" parameterType="int" resultMap="BaseProjectResult">
@@ -122,6 +119,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where source_id = #{projectId} and del_flag = 0
 	</select>
 
+	<select id="getAppCount"  resultType="int">
+		select count(id) as appnum
+		from sys_file_source
+		where source_id = #{projectId} and source_type = 5 and del_flag = 0
+	</select>
+
+	<select id="getProCount"  resultType="int">
+		select count(id) as pronum
+		from tb_project
+		where depart_id = #{projectId} and del_flag = 0
+	</select>
+
 	<select id="getProjectSomeLists" resultMap="BaseProjectResult">
 		select a.id, depart_name, head_name, contact_information,count(b.source_id) as appnum, remarks,a.create_user,a.update_user
 		from tb_project_depart a