From d9a74f6cd18d6acc22e7fc99d1225eb160d045e3 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 18 Feb 2025 10:27:25 +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=E6=98=AF=E5=90=A6=E6=9C=89=E6=B3=95=E5=AE=9A=E8=8A=82?=
 =?UTF-8?q?=E5=81=87=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/system/att/entity/AttGroupBean.java  | 3 +++
 .../src/main/resources/mapper/att/AttGroupMapper.xml         | 5 +++++
 2 files changed, 8 insertions(+)

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 297596f..57239db 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
@@ -140,6 +140,9 @@ public class AttGroupBean {
      */
     private String currentDay;
 
+    /**是否有法定节假日*/
+    private Integer isHaveHoliday;
+
     public AttGroupBean(Long groupId, String attDay, String toWorkTime, String offWorkTime,
                         Long todayClockNum, Long lateMinute, Long leaveMinute,
                         Long absenteeismLateMinute, Long absenteeismLeaveMinute,
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 a84571d..3d2f0ce 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
@@ -145,6 +145,7 @@
         <if test="entryAbnormalMinute != null ">,entry_abnormal_minute</if>
         <if test="todayClockNum != null ">,today_clock_num</if>
         <if test="attendanceDuration != null ">,attendance_duration</if>
+        <if test="isHaveHoliday!= null ">,is_have_holiday</if>
         )values( #{groupId}, #{attDay}
         <if test="toWorkTime != null and toWorkTime != ''">,#{toWorkTime}</if>
         <if test="offWorkTime != null and offWorkTime != ''">,#{offWorkTime}</if>
@@ -158,6 +159,7 @@
         <if test="entryAbnormalMinute != null ">,#{entryAbnormalMinute}</if>
         <if test="todayClockNum != null ">,#{todayClockNum}</if>
         <if test="attendanceDuration != null ">,#{attendanceDuration}</if>
+        <if test="isHaveHoliday != null ">,#{isHaveHoliday}</if>
         )
     </insert>
 
@@ -199,6 +201,9 @@
         <if test="attendanceDuration != null ">,attendance_duration =
             #{attendanceDuration}
         </if>
+        <if test="isHaveHoliday != null ">,is_have_holiday =
+            #{isHaveHoliday}
+        </if>
         where group_id = #{groupId}
     </update>
 </mapper>
\ No newline at end of file