加班修复

common/src/main/java/com/jpsoft/shinestar/modules/business/service/impl/WorkScheduleAttendanceServiceImpl.java

@@ -952,15 +952,15 @@ public class WorkScheduleAttendanceServiceImpl implements WorkScheduleAttendance
             WorkOverPerson workOverPerson = workOverPersonService.findByPersonIdAndDate(personInfo.getId(),attendanceTime.toDate());
             WorkOver workOver = null;
 
+            if(workOverPerson!=null) {
+                //说明下班后被安排了加班
+                workOver = workOverService.get(workOverPerson.getWorkOverId());
+            }
+
             //加班时如果是下班则考勤截止时间顺延
             if ("2".equals(classify)){
-                if(workOverPerson!=null){
-                    //说明下班后被安排了加班
-                    workOver = workOverService.get(workOverPerson.getWorkOverId());
-
-                    if(workOver!=null && workOver.getHours()!=null) {
-                        endTime = endTime.plusHours(workOver.getHours());
-                    }
+                if(workOver!=null && workOver.getHours()!=null) {
+                    endTime = endTime.plusHours(workOver.getHours());
                 }
             }
 

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/WorkOverController.java

@@ -679,9 +679,9 @@ public class WorkOverController {
         return resultStr;
     }
 
-    @PostMapping("updateFinshTime")
+    @PostMapping("updateFinishTime")
     @ApiOperation(value="更新加班完成时间")
-    public MessageResult<Integer> updateFinshTime(String day){
+    public MessageResult<Integer> updateFinishTime(String day){
         MessageResult<Integer> messageResult = new MessageResult<>();
 
         try {