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 @@ ,entry_abnormal_minute ,today_clock_num ,attendance_duration + ,is_have_holiday )values( #{groupId}, #{attDay} ,#{toWorkTime} ,#{offWorkTime} @@ -158,6 +159,7 @@ ,#{entryAbnormalMinute} ,#{todayClockNum} ,#{attendanceDuration} + ,#{isHaveHoliday} ) @@ -199,6 +201,9 @@ ,attendance_duration = #{attendanceDuration} + ,is_have_holiday = + #{isHaveHoliday} + where group_id = #{groupId} \ No newline at end of file