添加删除本地多余的部门部门

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java

@@ -174,7 +174,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
 
             DateTime attendStart = DateUtil.parseDate(DateUtil.formatDate(entity.getStartTime()));
             DateTime attendEnd = DateUtil.parseDate(DateUtil.formatDate(entity.getEndTime()));
-            Long compare1 = DateUtil.between(attendEnd, attendStart, DateUnit.DAY);
+            Long compare1 = DateUtil.betweenDay(attendEnd, attendStart, true);
             log.info("考勤计算天数区间：{}", compare1);
             for (int i = 0; i <= compare1.intValue(); i++) {
                 DateTime curDate = DateUtil.offsetDay(attendStart, i);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java

@@ -348,7 +348,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
                         goOffDateTime = DateUtil.offsetMinute(goOffDateTime, -attendanceClassDetailEntity.getOffWorkDateBefore());
                     }
                     for (AttendanceLeaveRecordEntity leaveRecord : leaveRecords) {
-                        long between = DateUtil.between(leaveRecord.getStartTime(), leaveRecord.getEndTime(), DateUnit.DAY);
+                        long between = DateUtil.betweenDay(leaveRecord.getStartTime(), leaveRecord.getEndTime(),true);
                         if (between == 0) {
                             //当天
                             // 1.判断异常时间与请假结束时间那个大。取大那个与当前班次下班时间比较差值，去正向值 偏移后的时间计算
@@ -422,7 +422,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
                     }
 
                     for (AttendanceLeaveRecordEntity leaveRecord : leaveRecords) {
-                        long between = DateUtil.between(leaveRecord.getStartTime(), leaveRecord.getEndTime(), DateUnit.DAY);
+                        long between = DateUtil.betweenDay(leaveRecord.getStartTime(), leaveRecord.getEndTime(), true);
                         if (between == 0) {
                             //当天
                             // 1.判断异常时间与请假开始时间那个大。
@@ -513,9 +513,12 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
 
     public static void main(String[] args) {
         long compare = DateUtil.compare(DateUtil.parseDateTime("2024-07-01 15:00:00"), DateUtil.parseDateTime("2024-07-01 16:00:00"));
-        long between = DateUtil.between(DateUtil.parseDateTime("2024-07-01 15:00:00"), DateUtil.parseDateTime("2024-07-01 16:00:00"), DateUnit.MINUTE, false);
+       // long between = DateUtil.between(DateUtil.parseDateTime("2024-07-01 15:00:00"), DateUtil.parseDateTime("2024-07-01 16:00:00"), DateUnit.MINUTE, false);
+        long between = DateUtil.betweenDay(DateUtil.parseDateTime("2024-07-01 15:00:00"), DateUtil.parseDateTime("2024-07-03 14:00:00"),true);
+        long between1 = DateUtil.between(DateUtil.parseDateTime("2024-07-01 15:00:00"), DateUtil.parseDateTime("2024-07-03 14:00:00"),DateUnit.DAY);
 
         System.out.println(compare);
         System.out.println(between);
+        System.out.println(between1);
     }
 }
\ No newline at end of file