合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/controller/AttendanceController.java

@@ -83,4 +83,16 @@ public class AttendanceController {
         return ok(userOverWorkVos);
     }
 
+    @ApiOperation(value = "手动增加个人加班时长", response = ApprovalInformation.class)
+    @GetMapping("/addOverWork/{userId}/{hour}")
+    public ResponseEntity addOverWork(@PathVariable String userId,@PathVariable Long hour){
+        UserOverWorkVo userOverWorkVo = attendanceDetailsService.addOverWork(userId,hour);
+        if(userOverWorkVo!=null){
+            return ok(userOverWorkVo);
+        }else{
+            return ok("增加个人加班时长失败");
+        }
+
+    }
+
 }

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/vo/UserOverWorkVo.java

@@ -15,6 +15,10 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @ApiModel(value = "返回前端员工加班时长", description = "返回前端员工加班时长")
 public class UserOverWorkVo {
+
+    @ApiModelProperty(value = "id",example = "12345treh232222221")
+    private String id;
+
     @ApiModelProperty(value = "名字",example = "gwj")
     private String name;
 

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/AttendanceDetailsService.java

@@ -61,4 +61,12 @@ public interface AttendanceDetailsService {
      * @return
      */
     List<UserOverWorkVo> findAllOverWork(String userId);
+
+    /**
+     * 手动增加个人加班时长
+     * @param userId
+     * @param hour
+     * @return
+     */
+    UserOverWorkVo addOverWork(String userId, Long hour);
 }

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/AttendanceDetailsServiceImpl.java

@@ -338,6 +338,7 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
         Optional<User> optional = pasUserDao.findById(userId);
         if(optional.isPresent()){
             User user = optional.get();
+            userOverWorkVo.setId(userId);
             userOverWorkVo.setName(user.getUsername());
         }
         if(userOverWork!=null){
@@ -429,6 +430,34 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
         return userOverWorkVos;
     }
 
+    /**
+     * 手动增加个人加班时长
+     * @param userId
+     * @param hour
+     * @return
+     */
+    @Override
+    public UserOverWorkVo addOverWork(String userId, Long hour) {
+        UserOverWorkVo userOverWorkVo = new UserOverWorkVo();
+        UserOverWork userOverWork = userOverWorkDao.findByUserId(userId);
+        Optional<User> optional = pasUserDao.findById(userId);
+        if(optional.isPresent()){
+            User user = optional.get();
+            if(userOverWork!=null){
+                Long overWorkHour = userOverWork.getOverWorkHour();
+                if(overWorkHour!=null){
+                    overWorkHour+=hour;
+                }
+                UserOverWork save = userOverWorkDao.save(new UserOverWork(userId, overWorkHour));
+                userOverWorkVo.setId(userId);
+                userOverWorkVo.setName(user.getUsername());
+                userOverWorkVo.setOverWorkHour(save.getOverWorkHour());
+                return userOverWorkVo;
+            }
+        }
+        return null;
+    }
+
 
     /**
      * 递归获得部门树