修改请假计算考勤

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

@@ -404,6 +404,12 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 if (ObjectUtils.isEmpty(goWorkDate)) {
                     //goWorkDate为空 缺卡状态
                     Date goWorkDate1 = attendanceClassDetailEntity.getGoWorkDate();
+
+                    if(attendanceClassDetailEntity.getGoWorkDateAfter()>0){
+                        goWorkDate1=DateUtil.offsetMinute(goWorkDate1, attendanceClassDetailEntity.getGoWorkDateAfter());
+
+                    }
+
                     //判断请假区间是否在上班区间内 如果在 则设置为请假 格式化时间范围
                     boolean in = DateUtil.isIn(goWorkDate1, DateUtil.parse(DateUtil.format(startLeaveTime, "HH:mm:ss"), "HH:mm:ss"),
                             DateUtil.parse(DateUtil.format(endLeaveTime, "HH:mm:ss"), "HH:mm:ss"));
@@ -426,7 +432,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                     Date offWorkDate1 = attendanceClassDetailEntity.getOffWorkDate();
 
                     if(attendanceClassDetailEntity.getOffWorkDateBefore()>0){
-                        offWorkDate1=DateUtil.offsetMinute(offWorkDate1, attendanceClassDetailEntity.getOffWorkDateBefore());
+                        offWorkDate1=DateUtil.offsetMinute(offWorkDate1, -attendanceClassDetailEntity.getOffWorkDateBefore());
                     }
 
                     boolean in = DateUtil.isIn(offWorkDate1, DateUtil.parse(DateUtil.format(startLeaveTime, "HH:mm:ss"), "HH:mm:ss"),