Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -5325,7 +5325,7 @@ 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")+")";
+                                String newStr = (double)find.get().get("workingTime")+"("+MessageUtils.message("leave.leave")+leave.getTimeHours()+"h)";
                                 find.get().put("workingTime", newStr);
                             }
                         } else {
@@ -5333,7 +5333,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             if (WorkDayCalculateUtils.isWorkDay(workDate)) {
                                 Map<String, Object> leaveMap = new HashMap<>();
                                 leaveMap.put("createDate", leaveDateStr);
-                                leaveMap.put("workingTime", MessageUtils.message("leave.leaveOfDay"));
+                                leaveMap.put("workingTime", MessageUtils.message("leave.leave")+leave.getTimeHours()+"h");
                                 worktimeList.add(leaveMap);
                             }
                         }