|
@@ -7701,11 +7701,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
if (leaveSheet.getStartDate().isBefore(localStartDate)){
|
|
if (leaveSheet.getStartDate().isBefore(localStartDate)){
|
|
//平均计算
|
|
//平均计算
|
|
float DifDay = localStartDate.toEpochDay() - leaveSheet.getStartDate().toEpochDay();
|
|
float DifDay = localStartDate.toEpochDay() - leaveSheet.getStartDate().toEpochDay();
|
|
- leaveTime+= timeHours*(DifDay/LeaveDay);
|
|
|
|
|
|
+ leaveTime+= timeHours*(1 - DifDay/LeaveDay);
|
|
}else {
|
|
}else {
|
|
//当请假时间结束时间跨月
|
|
//当请假时间结束时间跨月
|
|
float DifDay = leaveSheet.getEndDate().toEpochDay() - localEndDate.toEpochDay();
|
|
float DifDay = leaveSheet.getEndDate().toEpochDay() - localEndDate.toEpochDay();
|
|
- leaveTime+= timeHours*(DifDay/LeaveDay);
|
|
|
|
|
|
+ leaveTime+= timeHours*(1 - DifDay/LeaveDay);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|