人员修改

src/main/java/com/ydtech/modules/admin/constants/UserWorkStatus.java

@@ -8,12 +8,14 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum UserWorkStatus {
 
-    UWS_0(0,"在职"),
-    UWS_1(1,"正常"),
-    UWS_2(2,"入司待审核"),
-    UWS_3(3,"入司审核驳回"),
-    UWS_4(4,"离司待审核"),
-    UWS_5(5,"离司审核驳回");
+    UWS_0(0, "离司"),
+    UWS_1(1, "在职"),
+    UWS_2(2, "入司待审核"),
+    UWS_3(3, "入司审核驳回"),
+    UWS_4(4, "离司待审核"),
+    UWS_5(5, "离司审核驳回"),
+    UWS_6(6, "修改待审核"),
+    UWS_7(7, "修改审核驳回");
 
     private final Integer code;
 

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -452,7 +452,6 @@ public class SysUserController extends BaseController {
         return HttpResult.ok("", sysUserService.getQuTeamByCompany(quTeamNumDto));
     }
 
-
     @ApiOperation(value = "（重构）审批通过")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "用户ID")
@@ -460,16 +459,16 @@ public class SysUserController extends BaseController {
     @GetMapping(value = "/approvalPass")
     public HttpResult approvalPass(@RequestParam String userId) {
         SysUser sysUser = sysUserService.getById(userId);
-        if (sysUser.getStatus() == UserWorkStatus.UWS_2.getCode()) {
+        if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
-        } else if (sysUser.getStatus() == UserWorkStatus.UWS_4.getCode()) {
+        } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_0.getCode());
+        } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
+            sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
         }
-        SysUserTrack sysUserTrack = new SysUserTrack();
-        sysUserTrack.setUserId(userId);
-        sysUserTrack.setApproveBy(getUserName());
-        sysUserTrack.setStatus(sysUser.getStatus());
-        sysUserTrack.setApproveTime(new Date());
+
+        SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
+
         sysUserTrackService.save(sysUserTrack);
         return HttpResult.ok(sysUserService.updateById(sysUser));
 
@@ -484,21 +483,20 @@ public class SysUserController extends BaseController {
     @GetMapping(value = "/approvalNotPass")
     public HttpResult<Boolean> approvalNotPass(@RequestParam String userId, @RequestParam String reason) {
 
-
         SysUser sysUser = sysUserService.getById(userId);
         if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_3.getCode());
         } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_5.getCode());
+        } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
+            sysUser.setStatus(UserWorkStatus.UWS_7.getCode());
         }
+
         sysUser.setApprovalOpinion(reason);
-        SysUserTrack sysUserTrack = new SysUserTrack();
-        sysUserTrack.setUserId(userId);
-        sysUserTrack.setApproveBy(getUserName());
-        sysUserTrack.setStatus(sysUser.getStatus());
+        SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
         sysUserTrack.setApproveMess(reason);
-        sysUserTrack.setApproveTime(new Date());
         sysUserTrackService.save(sysUserTrack);
+
         return HttpResult.ok(sysUserService.updateById(sysUser));
 
     }
@@ -903,13 +901,4 @@ public class SysUserController extends BaseController {
     public HttpResult departApply(@RequestBody SysUser2Vo sysUserVO) {
         return sysUserService.departApply(sysUserVO) ? HttpResult.ok("离职申请提交成功") : HttpResult.error("离职申请提交失败");
     }
-
-
-    @ApiOperation(value = "离职恢复")
-    @PostMapping("/separationReinstatement/{id}")
-    public HttpResult separationReinstatement(@PathVariable String id) {
-        sysUserService.separationReinstatement(id);
-        return HttpResult.ok("恢复成功");
-    }
-
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -33,6 +33,7 @@ import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.model.vo.EsmUserImageVo;
 import com.ydtech.modules.esm.service.EsmUserImageService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
+import com.ydtech.modules.ins.model.yc.ruote.Base;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
@@ -639,11 +640,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, userId)).collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
         //添加轨迹
-        SysUserTrack sysUserTrack = new SysUserTrack();
-        sysUserTrack.setUserId(sysUser.getId());
-        sysUserTrack.setApproveBy(StpUtil.getLoginId().toString());
-        sysUserTrack.setStatus(sysUser.getStatus());
-        sysUserTrack.setApproveTime(new Date());
+        SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
+
         sysUserTrackService.save(sysUserTrack);
 
         return HttpResult.ok("新增成功");
@@ -687,14 +685,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = sysUserVo.getSysUser();
         int beStatus = sysUser.getStatus();
         //如果审核驳回则 重新修改为 审核状态
-        if(sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_3.getCode()){
+        if (sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_3.getCode()) {
             sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_2.getCode());
         }
 
-        if(sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_5.getCode()){
+        if (sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_5.getCode()) {
             sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_4.getCode());
         }
 
+        if (sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_7.getCode()) {
+            sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_6.getCode());
+        }
+
         //修改用户不能修改密码
         if (StringUtils.isEmpty(sysUser.getPassword())) {
             return HttpResult.error("密码不能为空");
@@ -716,7 +718,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             String pwd = PasswordUtils.encode(sysUser.getPassword(), salt);
             sysUser.setPassword(pwd);
             sysUser.setSalt(salt);
-        }else {
+        } else {
             sysUser.setPassword(sysUser_org.getPassword());
             sysUser.setSalt(sysUser_org.getSalt());
         }
@@ -724,6 +726,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if ("19".equals(sysUser.getRoleId())) {//19 出单员 校验机构和业务员机构是否一致
             return checkChuDanUser(sysUser);
         }
+
+        sysUser.setStatus(UserWorkStatus.UWS_6.getCode());
         updateById(sysUser);
 
         //角色配置
@@ -755,11 +759,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         esmUserImageService.saveBatch(esmUserImages);
 
         if (UserWorkStatus.UWS_5.getCode() == beStatus ||
-                UserWorkStatus.UWS_3.getCode() == beStatus) {
+                UserWorkStatus.UWS_3.getCode() == beStatus ||
+                UserWorkStatus.UWS_7.getCode() == beStatus) {
             //添加轨迹
             SysUserTrack sysUserTrack = new SysUserTrack();
             sysUserTrack.setUserId(sysUser.getId());
-            sysUserTrack.setApproveBy(StpUtil.getLoginId().toString());
+            SysUser user = BaseController.getUser();
+
+            sysUserTrack.setApproveBy(user.getName());
+            sysUserTrack.setApproveById(user.getId());
+
             sysUserTrack.setStatus(sysUserVo.getSysUser().getStatus());
             sysUserTrack.setApproveTime(new Date());
             sysUserTrackService.save(sysUserTrack);
@@ -1488,10 +1497,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/11 16:08
-     *  @Description:  查询所有的后线人员
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/11 16:08
+     * @Description: 查询所有的后线人员
      */
     @Override
     public List<SysUser> findHxUserList() {
@@ -1500,16 +1509,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 离职申请
+     *
      * @param sysUserVO
      * @return
      */
     @Override
     @Transactional
     public boolean departApply(SysUser2Vo sysUserVO) {
-        if(Objects.isNull(sysUserVO.getSysUser().getLogoutTime())){
+        if (Objects.isNull(sysUserVO.getSysUser().getLogoutTime())) {
             throw new SystemException("请填写离职时间");
         }
-        if(Objects.isNull(sysUserVO.getEsmUserImageVo()) &&  sysUserVO.getEsmUserImageVo().isEmpty()){
+        if (Objects.isNull(sysUserVO.getEsmUserImageVo()) && sysUserVO.getEsmUserImageVo().isEmpty()) {
             throw new SystemException("请上传离职证明");
         }
         SysUser byId = this.getById(sysUserVO.getSysUser().getId());
@@ -1520,15 +1530,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //添加离职证明
         EsmUserImageVo esmUserImageVo = sysUserVO.getEsmUserImageVo().get(0);
         esmUserImageVo.setType(InsuranceImageEnum.LZ_01.getCode());
-        EsmUserImage esmUserImage = new EsmUserImage(esmUserImageVo,sysUserVO.getSysUser().getId());
+        EsmUserImage esmUserImage = new EsmUserImage(esmUserImageVo, sysUserVO.getSysUser().getId());
         esmUserImageService.save(esmUserImage);
 
         //添加轨迹
-        SysUserTrack sysUserTrack = new SysUserTrack();
-        sysUserTrack.setUserId(byId.getId());
-        sysUserTrack.setApproveBy(StpUtil.getLoginId().toString());
-        sysUserTrack.setStatus(byId.getStatus());
-        sysUserTrack.setApproveTime(new Date());
+        SysUserTrack sysUserTrack = new SysUserTrack(byId);
         sysUserTrackService.save(sysUserTrack);
         return true;
     }