diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java index c6548fc9cf525d3ca34f646f915b0c67debfbe1c..b20fd2bbba7c99d07d3687bd4d6e933136c38ef8 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java +++ b/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(); diff --git a/attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http b/attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http index 19983aff38bc4be4749223c436a61da8a85fe07b..c768a43c61d0e47b64179db300154050daf89948 100644 --- a/attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http +++ b/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" }