From 7fb6106716448665181ad5c515ab09a6b8b5f463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B2=E5=AE=97=E9=87=91?= <1203338439@qq.com>
Date: Tue, 14 Jan 2025 13:02:34 +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

---
 .../com/bonus/system/att/tasks/HolidayTasks.java    |  2 +-
 .../resources/mapper/att/AttDetailByMonthMapper.xml | 13 +++++++------
 .../main/resources/mapper/att/WechatPushMapper.xml  | 13 +++++--------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/HolidayTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/HolidayTasks.java
index a720c4a..4308849 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/HolidayTasks.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/HolidayTasks.java
@@ -35,7 +35,7 @@ public class HolidayTasks {
     @Resource(name = "OrgChangeService")
     private OrgChangeService orgChangeService;
 
-    @Scheduled(cron = "0 0 5 26 12 *")//每天12月26日凌晨5点
+    @Scheduled(cron = "0 0 5 26 11 *")//每天12月26日凌晨5点
     @Async
     public void getAttTasks(){
         getHoliday();
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 b2d9d14..c0796ec 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
@@ -47,10 +47,10 @@
 
     <select id="selectAttAllList" resultType="com.bonus.system.att.entity.AttDetailByMonthBean">
         select
-        user_id as userId,
-        name as name,
-        org_id as orgId,
-        org_name as orgName,
+        amr.user_id as userId,
+        amr.name as name,
+        amr.org_id as orgId,
+        amr.org_name as orgName,
         att_current_month as attCurrentMonth,
         coalesce(required_days,0) as requiredDays,
         coalesce(normal_num,0) as normalNum,
@@ -61,7 +61,8 @@
         coalesce(address_error_num,0) as addressErrorNum,
         coalesce(ein_error_num,0) as einErrorNum
         from att_month_report amr
-        where amr.is_active = 1
+        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="bean.attCurrentMonth != null and bean.attCurrentMonth != '' ">
             and amr.att_current_month = #{bean.attCurrentMonth}
@@ -83,7 +84,7 @@
             </foreach>
             )
         </if>
-        group by user_id
+        group by amr.user_id
     </select>
 
     <select id="getOrgParentId" resultType="com.bonus.system.basic.domain.SysOrg">
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml
index 211455d..b753d23 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml
@@ -155,14 +155,11 @@
             att_range,
             so.lon,
             so.lat
-        FROM
-            att_group_person_relation ag
-                LEFT JOIN sys_organization so ON so.id = ag.org_id
-                LEFT JOIN att_group_setting agt on agt.group_id = ag.group_id and agt.is_active = '1'
-                AND so.is_active = '1'
-        WHERE
-            ag.is_active = '1'
-          AND ag.user_id = #{userId}
+        FROM att_group_person_relation ag
+        LEFT JOIN sys_organization so ON so.id = ag.org_id
+        LEFT JOIN att_group_setting agt on agt.group_id = ag.group_id and agt.is_active = '1'
+        AND so.is_active = '1'
+        WHERE ag.user_id = #{userId}
         limit 1
     </select>
     <select id="getWebLeaveList" resultType="com.bonus.system.evection.entity.EvectionBean">