|
@@ -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);
|
|
}
|
|
}
|
|
|
|
|