考勤明细修改审批考勤状态问题修改

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;
+
     /**
      * 下班打卡维度
      */

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
+        SELECT
-        left join sys_user su on su.user_id = v.user_id
+        su.user_name,
-        left join sys_organization so on so.id = v.org_id
+        so.org_name,
-        where v.att_current_day BETWEEN #{startDate} AND #{endDate} and v.is_update = 1 and su.is_active = 1
+        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>