|
@@ -5331,7 +5331,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
Object str = find.get().get("workingTime");
|
|
|
if (str instanceof Double) {
|
|
|
//String newStr = (double)find.get().get("workingTime")+"(请假)";
|
|
|
- String newStr = (double)find.get().get("workingTime")+"("+MessageUtils.message("leave.leave")+leave.getTimeHours()+"h)";
|
|
|
+ double leaveHours = 0.0;
|
|
|
+ if (leave.getStartDate().isEqual(leave.getEndDate())) {
|
|
|
+ leaveHours = leave.getTimeHours();
|
|
|
+ } else {
|
|
|
+ //跨天请假
|
|
|
+ leaveHours = leave.getTimeHours()/leave.getTimeDays();
|
|
|
+ }
|
|
|
+ String newStr = (double)find.get().get("workingTime")+"("+MessageUtils.message("leave.leave")+leaveHours+"h)";
|
|
|
find.get().put("workingTime", newStr);
|
|
|
}
|
|
|
} else {
|