From 960d9cd6f18a148a27a89263451ec8a65b63c6a7 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Wed, 12 Feb 2025 10:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E8=AE=A1=E5=88=92=E5=A4=A9=E6=95=B0?=
 =?UTF-8?q?=E6=8C=89=E5=BD=93=E6=9C=88=E6=9C=80=E5=90=8E=E6=89=80=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E7=BB=84=E7=BB=87=E5=86=B3=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/att/dao/AttSourceDataDao.java      |  2 +-
 .../com/bonus/system/att/tasks/AttTasks.java  | 16 +----
 .../mapper/att/AttSourceDataMapper.xml        | 68 +++++++++++--------
 3 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java
index 0126b18..5a3ad6c 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java
@@ -54,7 +54,7 @@ public interface AttSourceDataDao {
      * 查询月考勤情况
      * @return list bean
      */
-    List<AttMonthReportBean> selectAttMonthReport(@Param("pushDate")String pushDate,@Param("attRuleDate")String attRuleDate);
+    List<AttMonthReportBean> selectAttMonthReport(@Param("pushDate")String pushDate);
 
     /**
      * 新增月报表
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
index b2cef4f..d5eaa0d 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
@@ -1161,21 +1161,7 @@ public class AttTasks {
         List<AttDayReportBean> dayReportList = attSourceDataDao.selectAttDayReport(pushDate, pushType);
         //日报表新增
         attSourceDataDao.insertAttDayReport(dayReportList);
-        String attRuleDate;
-        //月报表查询
-        if (pushType == 2) {
-            //历史数据查询
-            //如果是当月，将最新时间，将最新时间存进去，如果是之前月，将之前月的最后一天存进去
-            // 当前日期时间
-            LocalDateTime now = LocalDateTime.now();
-            // 调用方法获取目标日期
-            LocalDate targetDate = getTargetDate(now);
-            attRuleDate = targetDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        }else{
-            //如果更新当天数据查询
-            attRuleDate = DateUtil.today();
-        }
-        List<AttMonthReportBean> monthReportList = attSourceDataDao.selectAttMonthReport(pushDate,attRuleDate);
+        List<AttMonthReportBean> monthReportList = attSourceDataDao.selectAttMonthReport(pushDate);
         //人员对应出月出勤天数
         monthReportList.forEach(c ->
                 groupList.stream()
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
index c7d1636..d9cd868 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
@@ -204,35 +204,47 @@
 
     </select>
 
+    <!--att_setting_history 的处理是为了获取当月最后一天在哪个考勤规则，去计算他的当月考勤天数 -->
     <select id="selectAttMonthReport" resultType="com.bonus.system.att.entity.AttMonthReportBean">
-        select g.org_id,
-        v.user_id,
-        su.user_name,
-        so.org_name,
-        g.group_id,
-        DATE_FORMAT(att_current_day, '%Y-%m')                            as attCurrentMonth,
-               IFNULL( sum( IF ( toWorkAttStatus = 1, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 1, 0.5, 0 )), 0 ) AS normalNum,
-               IFNULL( sum( IF ( toWorkAttStatus = 2, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 2, 0.5, 0 )), 0 ) AS lateNum,
-               IFNULL( sum( IF ( toWorkAttStatus = 3, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 3, 0.5, 0 )), 0 ) AS skippingNum,
-               IFNULL( sum( IF ( toWorkAttStatus = 4, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 4, 0.5, 0 )), 0 ) AS earlyNum,
-               IFNULL( sum( IF ( toWorkAttStatus = 5, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 5, 0.5, 0 )), 0 ) AS restNum,
-               sum(
-                       IF
-                       ( toWorkAttStatus IN ( SELECT dict_value FROM sys_dict_data WHERE dict_type = 'att_status' AND is_leave = '1' ), 0.5, 0 ))+ sum(
-                       IF
-                       ( offWorkAttStatus IN ( SELECT dict_value FROM sys_dict_data WHERE dict_type = 'att_status' AND is_leave = '1' ), 0.5, 0 )) AS leaveNum,
-               IFNULL( sum( IF ( toWorkAttStatus = 7, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 7, 0.5, 0 )), 0 ) AS outNum,
-               IFNULL( sum( IF ( toWorkAttStatus = 8, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 8, 0.5, 0 )), 0 ) AS einErrorNum,
-               IFNULL( sum( IF ( toWorkAttStatus = 9, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 9, 0.5, 0 )), 0 ) AS addressErrorNum,
-               IFNULL( sum( IF ( toWorkAttStatus = 10, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 10, 0.5, 0 )), 0 ) AS businessTripNum
-        from v_att_update_data v
-        left join sys_user su on su.user_id = v.user_id
-        left join att_setting_history g
-        on g.user_id = v.user_id and g.current_day = #{attRuleDate}
-        left join sys_organization so on so.id = g.org_id
-        where DATE_FORMAT(att_current_day, '%Y-%m') = DATE_FORMAT(#{pushDate}, '%Y-%m')
-        and g.group_id is not null
-        GROUP BY DATE_FORMAT(att_current_day, '%Y-%m'), v.user_id
+        SELECT
+            g.org_id,
+            v.user_id,
+            su.user_name,
+            so.org_name,
+            g.group_id,
+            DATE_FORMAT( att_current_day, '%Y-%m' ) AS attCurrentMonth,
+            IFNULL( sum( IF ( toWorkAttStatus = 1, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 1, 0.5, 0 )), 0 ) AS normalNum,
+            IFNULL( sum( IF ( toWorkAttStatus = 2, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 2, 0.5, 0 )), 0 ) AS lateNum,
+            IFNULL( sum( IF ( toWorkAttStatus = 3, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 3, 0.5, 0 )), 0 ) AS skippingNum,
+            IFNULL( sum( IF ( toWorkAttStatus = 4, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 4, 0.5, 0 )), 0 ) AS earlyNum,
+            IFNULL( sum( IF ( toWorkAttStatus = 5, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 5, 0.5, 0 )), 0 ) AS restNum,
+            sum(
+                    IF
+                    ( toWorkAttStatus IN ( SELECT dict_value FROM sys_dict_data WHERE dict_type = 'att_status' AND is_leave = '1' ), 0.5, 0 ))+ sum(
+                    IF
+                    ( offWorkAttStatus IN ( SELECT dict_value FROM sys_dict_data WHERE dict_type = 'att_status' AND is_leave = '1' ), 0.5, 0 )) AS leaveNum,
+            IFNULL( sum( IF ( toWorkAttStatus = 7, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 7, 0.5, 0 )), 0 ) AS outNum,
+            IFNULL( sum( IF ( toWorkAttStatus = 8, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 8, 0.5, 0 )), 0 ) AS einErrorNum,
+            IFNULL( sum( IF ( toWorkAttStatus = 9, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 9, 0.5, 0 )), 0 ) AS addressErrorNum,
+            IFNULL( sum( IF ( toWorkAttStatus = 10, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 10, 0.5, 0 )), 0 ) AS businessTripNum
+        FROM
+            v_att_update_data v
+                LEFT JOIN sys_user su ON su.user_id = v.user_id
+                LEFT JOIN (
+                SELECT
+                    *
+                FROM
+                    ( SELECT DISTINCT * FROM att_setting_history WHERE DATE_FORMAT( current_day, '%Y-%m' ) = DATE_FORMAT(#{pushDate}, '%Y-%m' ) ORDER BY current_day DESC ) a
+                GROUP BY
+                    user_id
+            ) g ON g.user_id = v.user_id
+                LEFT JOIN sys_organization so ON so.id = g.org_id
+        WHERE
+            DATE_FORMAT( att_current_day, '%Y-%m' ) = DATE_FORMAT(#{pushDate}, '%Y-%m' )
+          AND g.group_id IS NOT NULL
+        GROUP BY
+            DATE_FORMAT( att_current_day, '%Y-%m' ),
+            v.user_id
     </select>
 
     <select id="selectHolidayByMonth" resultType="com.bonus.system.att.entity.Holiday">