请假优化

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/LeaveSheetServiceImpl.java

@@ -752,19 +752,13 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
                     //当请假时间开始时间超出
                     if (leaveSheet.getStartDate().isBefore(localStartDate)){
                         //超出的天数
-                        int startDay = WorkDayCalculateUtils.getWorkDaysListInRange(leaveSheet.getStartDate().toString(), localStartDate.toString(), 0).size();
-                        if (WorkDayCalculateUtils.isWorkDay(leaveSheet.getStartDate())){
-                            startDay--;
-                        }
+                        int startDay = WorkDayCalculateUtils.getWorkDaysListInRange(leaveSheet.getStartDate().toString(), localStartDate.minusDays(1).toString(), 0).size();
                         float DifDay = leaveDays - startDay;
                         leaveTime+= allDay*DifDay;
                     }else {
                         //当请假时间结束时间超出
                         //超出的天数
-                        int endDay = WorkDayCalculateUtils.getWorkDaysListInRange(localEndDate.toString(),leaveSheet.getEndDate().toString(),  0).size();
-                        if (WorkDayCalculateUtils.isWorkDay(leaveSheet.getStartDate())){
-                            endDay--;
-                        }
+                        int endDay = WorkDayCalculateUtils.getWorkDaysListInRange(localEndDate.plusDays(1).toString(),leaveSheet.getEndDate().toString(),  0).size();
                         float DifDay = leaveDays - endDay;
                         leaveTime+= allDay*DifDay;
                     }