Browse Source

考勤相关修改修正开始时间和结束时间

chenjun 1 year ago
parent
commit
74d947e9b7

+ 9 - 0
zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/attendance/AttendanceSheetServiceImpl.java

@@ -449,12 +449,21 @@ public class AttendanceSheetServiceImpl implements AttendanceSheetService {
             LocalDateTime endTime = localDateTimes.getEndTime();
             LocalTime startLocalTime = startTime.toLocalTime();
             LocalTime endLocalTime = endTime.toLocalTime();
+            if(endLocalTime.compareTo(LocalTime.MIDNIGHT)==0){
+                endTime = endTime.plusHours(-1);
+                endLocalTime = endTime.toLocalTime();
+            }
+            if(startLocalTime.compareTo(finishPmFlag)>0){
+                startTime = startTime.plusDays(1).withHour(9).withMinute(0).withSecond(0).withNano(0);
+                startLocalTime = startTime.toLocalTime();
+            }
             if(startLocalTime.compareTo(normalTimeAm)<0){
                 startLocalTime = normalTimeAm;
             }
             if(endLocalTime.compareTo(finishPmFlag)>0){
                 endLocalTime = finishPmFlag;
             }
+
             //请假时间段在同一天
             if (LocalDateTimeUtil.isSameDay(startTime, endTime)) {
                 //请假开始时间在早上上下班之间,结束时间在早上上下班之间,请假状态修改当天早上考勤状态