From 038a344b6ec26739965b21194cf3be26e8808428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Fri, 24 Oct 2025 15:12:34 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/bmw/BmWorkerAttMapper.xml       | 4 +---
 .../src/main/resources/mapper/bmw/ProStatisticsMapper.xml     | 2 +-
 .../src/main/resources/mapper/bmw/RepairCardApplyMapper.xml   | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml
index c0b0047..2161a21 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml
@@ -118,15 +118,13 @@
         LEFT JOIN bm_att_person bap ON bap.pro_id = pp.id AND pst.id = bap.team_id AND bap.att_day = #{startDate}
     WHERE
       pp.id = #{proId}
-      AND pp.is_active = 1
+      AND pp.is_active = 1 and pst.id is not null
     <if test="subName != null and subName != ''">
       AND ps.sub_name = #{subName}
     </if>
     <if test="teamName != null and teamName != ''">
       AND pst.team_name = #{teamName}
     </if>
-
-
     GROUP BY
     pst.id
   </select>
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml
index 210313d..7055bb1 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml
@@ -107,7 +107,7 @@
   <select id="getWorkerWage" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo">
     SELECT
       sum(pp.net_salary) AS salaryMoneyNum,
-      sum(pp.id) AS payrollNum,
+      count(pp.id) AS payrollNum,
       sum(pp.pay_num) AS payrollWorkerTime
     FROM
         tb_pro_month_table pp
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml
index 969d1ea..0943f61 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml
@@ -285,11 +285,13 @@
             pp.pro_name proName,
             count( distinct brca.id ) num,
             count( distinct brcr.worker_id ) personNum,
-            sum( brcr.repair_day ) days,
+            count(DISTINCT bap.att_day) days,
             brca.create_time createTime
         FROM
             bm_repair_card_apply brca
                 LEFT JOIN bm_repair_card_record brcr ON brca.id = brcr.apply_id
+                LEFT JOIN bm_att_person bap ON brca.pro_id = bap.pro_id
+                AND bap.is_repair = 1
                 LEFT JOIN pm_project pp ON pp.id = brca.pro_id
         WHERE
             brca.is_active = 1