From f8ccb1875a09c7212b7741e9e72bd399d41561e7 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Tue, 25 Feb 2025 13:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=98=8E=E7=BB=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AE=A1=E6=89=B9=E8=80=83=E5=8B=A4=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/att/entity/AttDataDetailsBean.java | 10 ++++++++++
 .../mapper/att/AttendanceDetailsMapper.xml    | 19 +++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java
index ec03e13..f65fdad 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java
@@ -100,6 +100,11 @@ public class AttDataDetailsBean {
      */
     private String toWorkUpdateAttStatus;
 
+    /**
+     * 修改后上班考勤名
+     */
+    private String toWorkUpdateAtt;
+
     /**
      * 上班打卡维度
      */
@@ -150,6 +155,11 @@ public class AttDataDetailsBean {
      */
     private String offWorkUpdateAttStatus;
 
+    /**
+     * 修改后下班考勤名
+     */
+    private String offWorkUpdateAtt;
+
     /**
      * 下班打卡维度
      */
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml
index 82350ee..d77db2f 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml
@@ -242,10 +242,21 @@
     </select>
 
     <select id="selectAttUpdateList" resultType="com.bonus.system.att.entity.AttDataDetailsBean">
-        select su.user_name, so.org_name, v.* from v_att_update_data v
-        left join sys_user su on su.user_id = v.user_id
-        left join sys_organization so on so.id = v.org_id
-        where v.att_current_day BETWEEN #{startDate} AND #{endDate} and v.is_update = 1 and su.is_active = 1
+        SELECT
+        su.user_name,
+        so.org_name,
+        sdd.dict_label as toWorkUpdateAtt,
+        sdd2.dict_label as offWorkUpdateAtt,
+        v.*
+        FROM
+        v_att_update_data v
+        LEFT JOIN sys_user su ON su.user_id = v.user_id
+        LEFT JOIN sys_organization so ON so.id = v.org_id
+        LEFT JOIN sys_dict_data sdd ON sdd.dict_sort = v.toWorkUpdateAttStatus
+        AND sdd.dict_type = 'att_status'
+        LEFT JOIN sys_dict_data sdd2 ON sdd2.dict_sort = v.offWorkUpdateAttStatus
+        AND sdd2.dict_type = 'att_status'
+        WHERE v.att_current_day BETWEEN #{startDate} AND #{endDate} and v.is_update = 1 and su.is_active = 1
         <if test="orgId != null and orgId != ''">
             AND v.org_id = #{orgId}
         </if>