From e4b0c3ad724dc333f549a33475331cb8d6ee408e Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Wed, 8 Jan 2025 15:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E8=A7=84=E5=88=99=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=8C=83=E5=9B=B4=E5=92=8C=E4=B8=AD=E5=8D=88=E4=BC=91?=
 =?UTF-8?q?=E6=81=AF=E6=97=B6=E9=97=B4=20=E8=80=83=E5=8B=A4=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=87=BA=E5=85=A5=E6=AC=A1=E6=95=B0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/system/att/entity/AttGroupBean.java    |  6 ++++++
 .../com/bonus/system/att/tasks/AttTasks.java     | 16 +++++++++++++---
 .../main/resources/mapper/att/AttGroupMapper.xml |  9 +++++++++
 .../mapper/att/AttendanceDetailsMapper.xml       |  6 +++---
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttGroupBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttGroupBean.java
index e297739..31f8753 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttGroupBean.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttGroupBean.java
@@ -49,6 +49,12 @@ public class AttGroupBean {
      */
     private String breakEndTime;
 
+
+    /**
+     * 考勤范围
+     */
+    private int attRange;
+
     /**
      * 每天打卡（次）
      */
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 3e3188e..58c060b 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
@@ -353,7 +353,7 @@ public class AttTasks {
         if (groupList.isEmpty()) {
             return new ArrayList<>();
         }
-        //查询前三天是否有节假日或补班
+        //查询当月否有节假日或补班
         List<Holiday> holidays = attSourceDataDao.selectHolidayByMonth(pushDate, pushType);
         groupList.forEach(c -> {
             //应考勤天
@@ -396,7 +396,14 @@ public class AttTasks {
             // 判断 pushDate 是否在今天之前
             boolean isPastDate = isBeforeToday(pushDate);
             if (isPastDate) {
-                v.setAttStatus("3");
+                //不存在且在今天之前
+                //之前处理过节假日的数据，只有是默认数据才能将旷工状态写入
+                if (v.getAttStatus().equals("0")) {
+                    v.setAttStatus("3");
+                }
+            }else{
+                //不存在就在今天
+                //逻辑跟修改相同，第一次就不去麻烦根据时间判断状态了
             }
             attSourceDataDao.insertAttData(v);
         } else {
@@ -414,7 +421,10 @@ public class AttTasks {
             // 判断 pushDate 是否在今天之前
             boolean isPastDate = isBeforeToday(pushDate);
             if (isPastDate) {
-                v.setAttStatus("3");
+                //之前处理过节假日的数据，只有是默认数据才能将旷工状态写入
+                if (v.getAttStatus().equals("0")) {
+                    v.setAttStatus("3");
+                }
             }
             attSourceDataDao.insertAttUpdateData(v);
         } else {
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml
index 19aebb1..7c777f5 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml
@@ -123,6 +123,9 @@
         insert into att_group_setting(group_id, att_day
         <if test="toWorkTime != null and toWorkTime != ''">,to_work_time</if>
         <if test="offWorkTime != null and offWorkTime != ''">,off_work_time</if>
+        <if test="breakStartTime != null and breakStartTime != ''">,break_start_time</if>
+        <if test="breakEndTime != null and breakEndTime != ''">,break_end_time</if>
+        <if test="attRange != null and attRange != ''">,att_range</if>
         <if test="lateMinute != null ">,late_minute</if>
         <if test="leaveMinute != null ">,leave_minute</if>
         <if test="absenteeismLateMinute != null ">,absenteeism_late_minute</if>
@@ -133,6 +136,9 @@
         )values( #{groupId}, #{attDay}
         <if test="toWorkTime != null and toWorkTime != ''">,#{toWorkTime}</if>
         <if test="offWorkTime != null and offWorkTime != ''">,#{offWorkTime}</if>
+        <if test="breakStartTime != null and breakStartTime != ''">,#{breakStartTime}</if>
+        <if test="breakEndTime != null and breakEndTime != ''">,#{breakEndTime}</if>
+        <if test="attRange != null and attRange != ''">,#{attRange}</if>
         <if test="lateMinute != null ">,#{lateMinute}</if>
         <if test="leaveMinute != null ">,#{leaveMinute}</if>
         <if test="absenteeismLateMinute != null ">,#{absenteeismLateMinute}</if>
@@ -163,6 +169,9 @@
         update att_group_setting set att_day = #{attDay}
         <if test="toWorkTime != null and toWorkTime != ''">,to_work_time = #{toWorkTime}</if>
         <if test="offWorkTime != null and offWorkTime != ''">,off_work_time = #{offWorkTime}</if>
+        <if test="breakStartTime != null and breakStartTime != ''">,break_start_time = #{breakStartTime}</if>
+        <if test="breakEndTime != null and breakEndTime != ''">,break_end_time = #{breakEndTime}</if>
+        <if test="attRange != null and attRange != ''">,att_range = #{attRange}</if>
         <if test="lateMinute != null ">,late_minute = #{lateMinute}</if>
         <if test="leaveMinute != null ">,leave_minute = #{leaveMinute}</if>
         <if test="absenteeismLateMinute != null ">,absenteeism_late_minute =
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 d109efa..54854e5 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
@@ -5,12 +5,12 @@
 <mapper namespace="com.bonus.system.att.dao.AttendanceDetailsDao">
 
     <select id="selectAttDetailsList" resultType="com.bonus.system.att.entity.AttDataDetailsBean">
-        select su.user_name, so.org_name,COUNT( DISTINCT awa.user_id ) as outCount,
+        select su.user_name, so.org_name,IF(awa.outCount is null,0,awa.outCount) as outCount,
                COUNT(DISTINCT asd.att_current_time ) AS attCount,
                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 att_work_abnormal awa ON v.user_id = awa.user_id
+        LEFT JOIN (SELECT user_id,att_current_day,count(user_id) as outCount  FROM att_work_abnormal GROUP BY att_current_day,user_id) awa ON v.user_id = awa.user_id
         AND v.att_current_day = awa.att_current_day
         LEFT JOIN att_source_data asd ON su.user_name = asd.`name` and asd.att_current_day = v.att_current_day
         where v.att_current_day BETWEEN #{bean.startDate} AND #{bean.endDate}
@@ -31,7 +31,7 @@
             <if test='bean.attStatus == "1"'>
                 and ( toWorkAttStatus = #{bean.attStatus} and offWorkAttStatus = #{bean.attStatus} )
             </if>
-            <if test='attStatus != "1"'>
+            <if test='bean.attStatus != "1"'>
                 and ( toWorkAttStatus = #{bean.attStatus} or offWorkAttStatus = #{bean.attStatus} )
             </if>
         </if>