添加假日数据

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -84,8 +84,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         Long weekClassId = this.getWeekClassId(attendanceGroupFixedworkEntity, week);
         //log.info("weekClassId:{}", weekClassId);
         //weekClassId为-1 则不在考勤
-        Boolean checkWorkByHoliday = checkWorkByHoliday();
-        Boolean checkHolidayByWorkDay = checkHolidayByWorkDay();
+        Boolean checkWorkByHoliday = checkWorkByHoliday(commonData.getDateStr());
+        Boolean checkHolidayByWorkDay = checkHolidayByWorkDay(commonData.getDateStr());
 
         if (weekClassId == -1L) {
             //跳过本次循环
@@ -221,10 +221,10 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
 //
 //                    }
 
-                    if (goInTime == false && offInTime == false) {
-                         log.info("考勤时间不在上班区间与下班区间中，不做处理！attendDate:{}", DateUtil.formatDateTime(commonData.getAttendanceDate()));
-                       // continue;
-                    }
+//                    if (goInTime == false && offInTime == false) {
+//                         log.info("考勤时间不在上班区间与下班区间中，不做处理！attendDate:{}", DateUtil.formatDateTime(commonData.getAttendanceDate()));
+//                       // continue;
+//                    }
                     if (goInTime) {
                         //如果是上班打卡区间范围,判断是否迟到
                         for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
@@ -454,11 +454,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
     }
 
 
-    private Boolean checkWorkByHoliday() {
+    private Boolean checkWorkByHoliday(String date) {
         Boolean bool = false;
         HolidayQuery holidayQuery = new HolidayQuery();
-        holidayQuery.setStartTimeStart(DateUtil.today());
-        holidayQuery.setStartTimeEnd(DateUtil.today());
+        holidayQuery.setStartTimeStart(date);
+        holidayQuery.setStartTimeEnd(date);
         HolidayEntity holidayEntity = holidayService.selectOne(holidayQuery);
         if (!ObjectUtils.isEmpty(holidayEntity)) {
             Integer workorholiday = holidayEntity.getWorkorholiday();
@@ -470,11 +470,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         return bool;
     }
 
-    private Boolean checkHolidayByWorkDay() {
+    private Boolean checkHolidayByWorkDay(String date) {
         Boolean bool = false;
         HolidayQuery holidayQuery = new HolidayQuery();
-        holidayQuery.setStartTimeStart(DateUtil.today());
-        holidayQuery.setStartTimeEnd(DateUtil.today());
+        holidayQuery.setStartTimeStart(date);
+        holidayQuery.setStartTimeEnd(date);
         HolidayEntity holidayEntity = holidayService.selectOne(holidayQuery);
         if (!ObjectUtils.isEmpty(holidayEntity)) {
             Integer workorholiday = holidayEntity.getWorkorholiday();

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -33,8 +33,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "attendanceDateStart":"2023-10-19",
-  "attendanceDateEnd":"2023-10-19"
+  "attendanceDateStart":"2023-10-05",
+  "attendanceDateEnd":"2023-10-05"
 }