From 5fe413c07d332de864773b18f860db1d5b1a8bd1 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 30 Sep 2024 10:15:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectViewTwoController.java  |  4 ++--
 .../bonus/screen/mapper/TeamRecordMapper.java |  2 +-
 .../service/impl/ProjectViewServiceImpl.java  |  4 ++--
 .../mapper/screen/TeamRecordMapper.xml        | 19 ++++++++++++-------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java
index c8c04ac..8ec26bf 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java
@@ -83,8 +83,8 @@ public class ProjectViewTwoController extends BaseController {
      * @return
      */
     @GetMapping("/getTeamDataAmount")
-    public AjaxResult getTeamDataAmount() {
-        return success(projectViewService.getTeamDataAmount());
+    public AjaxResult getTeamDataAmount(TeamRecord record) {
+        return success(projectViewService.getTeamDataAmount(record));
     }
 
     /**
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java
index f1523d2..c49d6f9 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java
@@ -15,7 +15,7 @@ public interface TeamRecordMapper {
      * 施工记录数量
      * @return
      */
-    TeamRecordNum getTeamDataAmount();
+    TeamRecordNum getTeamDataAmount(TeamRecord record);
 
     /**
      * 施工班组详情页
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java
index 8f03ecb..33e8386 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java
@@ -207,8 +207,8 @@ public class ProjectViewServiceImpl {
      * 施工记录数量
      * @return
      */
-    public TeamRecordNum getTeamDataAmount() {
-        return teamRecord.getTeamDataAmount();
+    public TeamRecordNum getTeamDataAmount(TeamRecord record) {
+        return teamRecord.getTeamDataAmount(record);
     }
 
     /**
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml
index b6bc0a2..e4e48ee 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml
@@ -5,15 +5,20 @@
 <!--    施工记录数量  -->
     <select id="getTeamDataAmount" resultType="com.bonus.screen.vo.TeamRecordNum">
         SELECT
-            ( SELECT COUNT( tt.id ) FROM tb_team tt WHERE tt.del_flag = 0 AND tt.js_time IS NULL ) AS teamNum,
-            COUNT( tp.id ) AS peopleNum,
-            COUNT( CASE WHEN ( tp.post_code IN ( '0900101', '0900102', '0900103' )) THEN 1 END ) AS teamMaster,
-            COUNT( CASE WHEN tp.post_code = '0900104' THEN 1 END ) AS teamSame,
-            COUNT( CASE WHEN tp.post_code = '0900106' THEN 1 END ) AS teamSpecial
+            COUNT(DISTINCT tt.id) AS teamNum,
+            COUNT(DISTINCT tp.id) AS peopleNum,
+            COUNT(CASE WHEN tp.post_code IN ('0900101', '0900102', '0900103') THEN 1 END) AS teamMaster,
+            COUNT(CASE WHEN tp.post_code = '0900104' THEN 1 END) AS teamSame,
+            COUNT(CASE WHEN tp.post_code = '0900106' THEN 1 END) AS teamSpecial
         FROM
-            tb_people tp
+            tb_team tt
+                LEFT JOIN
+            tb_people tp ON tt.id = tp.team_id AND tp.del_flag = 0
         WHERE
-            tp.del_flag = 0
+            tt.del_flag = 0 AND tt.js_time IS NULL
+          <if test="proId != null">
+            AND tt.pro_id = #{proId}
+          </if>
     </select>
 
 <!--    施工班组详情页  -->