Ver código fonte

跨天请假的时候,请假单上获取一天的请假时长处理

QuYueTing 3 semanas atrás
pai
commit
b44af2b462

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

@@ -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 {