浏览代码

加班工时计算完善。

zhengqiang 4 年之前
父节点
当前提交
f20d98e8a9

+ 10 - 0
common/src/main/java/com/jpsoft/shinestar/modules/business/service/impl/WorkScheduleAttendanceServiceImpl.java

@@ -1025,6 +1025,16 @@ public class WorkScheduleAttendanceServiceImpl implements WorkScheduleAttendance
                             workOverPerson.setFinishTime(workOver.getEndTime());
                             workOverPerson.setFinishTime(workOver.getEndTime());
                             workOverPerson.setUpdateTime(new Date());
                             workOverPerson.setUpdateTime(new Date());
 
 
+                            if (workOverPerson.getBeginTime() != null && workOverPerson.getFinishTime() != null) {
+                                int minutes = (int) Minutes.minutesBetween(new DateTime(workOverPerson.getBeginTime()),
+                                        new DateTime(workOverPerson.getFinishTime())).getMinutes();
+                                workOverPerson.setDuration(minutes);
+
+                                int intHours = minutes / 60;
+                                int intMinutes = minutes % 60;
+                                workOverPerson.setDurationStr(intHours + "小时" + intMinutes + "分钟");
+                            }
+
                             workOverPersonService.update(workOverPerson);
                             workOverPersonService.update(workOverPerson);
                         }
                         }