From 7ed73c85bd287a861a5e55d228e2310cea2db8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B2=E5=AE=97=E9=87=91?= <1203338439@qq.com>
Date: Sat, 11 Jan 2025 19:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=87=E6=9C=9F=EF=BC=8C?=
 =?UTF-8?q?=E8=8A=82=E5=81=87=E6=97=A5=E5=AE=9A=E6=97=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/att/AttDetailByMonthMapper.xml     | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttDetailByMonthMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttDetailByMonthMapper.xml
index b11c8bf..b2d9d14 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttDetailByMonthMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttDetailByMonthMapper.xml
@@ -12,22 +12,23 @@
     </select>
 
     <select id="selectAttDetailList" resultType="com.bonus.system.att.entity.AttDetailByMonthBean">
-        select
-        user_id as userId,
-        name as name,
-        org_id as orgId,
-        org_name as orgName,
-        att_current_month as attCurrentMonth,
-        coalesce(required_days,0) as requiredDays,
-        coalesce(normal_num,0) as normalNum,
-        coalesce(late_num,0) as lateNum,
-        coalesce(early_num,0) as earlyNum,
-        coalesce(skipping_num,0) as skippingNum,
-        coalesce(leave_num,0) as leaveNum,
-        coalesce(address_error_num,0) as addressErrorNum,
-        coalesce(ein_error_num,0) as einErrorNum
-        from att_month_report amr
-        where amr.is_active = 1
+        SELECT
+        amr.user_id AS userId,
+        amr.NAME AS NAME,
+        amr.org_id AS orgId,
+        org_name AS orgName,
+        att_current_month AS attCurrentMonth,
+        COALESCE ( required_days, 0 ) AS requiredDays,
+        COALESCE ( normal_num, 0 ) AS normalNum,
+        COALESCE ( late_num, 0 ) AS lateNum,
+        COALESCE ( early_num, 0 ) AS earlyNum,
+        COALESCE ( skipping_num, 0 ) AS skippingNum,
+        COALESCE ( leave_num, 0 ) AS leaveNum,
+        COALESCE ( address_error_num, 0 ) AS addressErrorNum,
+        COALESCE ( ein_error_num, 0 ) AS einErrorNum
+        FROM att_month_report amr
+        left join att_group_person_relation p on p.user_id = amr.user_id
+        where amr.is_active = 1 and p.is_active = 1
         and amr.required_days != amr.normal_num
         <if test="attCurrentMonth != null and attCurrentMonth != '' ">
             and amr.att_current_month = #{attCurrentMonth}
@@ -41,7 +42,7 @@
         <if test="name != null and name != ''">
             AND amr.name like concat('%', #{name}, '%')
         </if>
-        group by user_id
+        group by amr.user_id
     </select>
 
     <select id="selectAttAllList" resultType="com.bonus.system.att.entity.AttDetailByMonthBean">