增加未完成的工作

web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java

@@ -1,6 +1,7 @@
 package com.zcloud.basic.info.command;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.dto.SingleResponse;
@@ -25,6 +26,10 @@ import com.zcloud.gbscommon.zcloudhidden.request.HiddenStatisticsListQry;
 import com.zcloud.gbscommon.zcloudhidden.request.HiddenUpdateCmd;
 import com.zcloud.gbscommon.zcloudhidden.response.HiddenListByUserCO;
 import com.zcloud.gbscommon.zcloudhidden.response.HiddenListCO;
+import com.zcloud.gbscommon.zcloudrisk.facade.ZcloudRiskFacade;
+import com.zcloud.gbscommon.zcloudrisk.request.ListManagerQry;
+import com.zcloud.gbscommon.zcloudrisk.request.ListManagerStatusUpdateCmd;
+import com.zcloud.gbscommon.zcloudrisk.response.ListManagerListByUserCO;
 import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserJobFacade;
 import com.zcloud.gbscommon.zclouduser.request.ZcloudUserJobQry;
 import com.zcloud.gbscommon.zclouduser.response.ZcloudUserJobCo;
@@ -74,8 +79,8 @@ public class UserUpdateExe {
     private ZcloudRedisUtil zcloudRedisUtil;
     @DubboReference
     private ZcloudHiddenFacade zcloudHiddenFacade;
-
+    @DubboReference
-
+    private ZcloudRiskFacade zcloudRiskFacade;
 
 
     @Transactional(rollbackFor = Exception.class)
@@ -242,7 +247,6 @@ public class UserUpdateExe {
     }
 
 
-
     public void executeReviewStatus(UserReviewStatusCmd userReviewStatusCmd) {
         //获取用户信息,并更新审核状态
         UserDO userDO = userRepository.getInfoById(userReviewStatusCmd.getUserId());
@@ -259,6 +263,7 @@ public class UserUpdateExe {
 
     /**
      * 离职
+     *
      * @param userDO
      * @param userReviewStatusCmd
      */
@@ -436,9 +441,6 @@ public class UserUpdateExe {
     }
 
     private List<UserJobHandoverDO> getUserJob(Long userId, Long corpinfoId, String userChangeRecordId) {
-        ZcloudUserJobQry zcloudUserJobQry = new ZcloudUserJobQry();
-        zcloudUserJobQry.setUserId(userId);
-        zcloudUserJobQry.setCorpinfoId(corpinfoId);
         List<UserJobHandoverDO> allJob = new ArrayList<>();
         //隐患id
         HiddenStatisticsListQry hiddenStatisticsListQry = new HiddenStatisticsListQry();
@@ -447,7 +449,10 @@ public class UserUpdateExe {
         hiddenStatisticsListQry.setDeptId(corpinfoId);
         List<HiddenListByUserCO> hiddenListCOList = null;
         try {
+
+            log.info("获取用户隐患信息, userId: {}, corpinfoId: {}", userId, corpinfoId);
             MultiResponse<HiddenListByUserCO> hiddenListCOMultiResponse = zcloudHiddenFacade.listByUserId(hiddenStatisticsListQry);
+            log.info("获取用户隐患信息返回, userId: {}, corpinfoId: {}, data: {}", userId, corpinfoId, JSONUtil.toJsonStr(hiddenListCOList));
             hiddenListCOList = hiddenListCOMultiResponse.getData();
         } catch (Exception e) {
             log.error("获取用户隐患信息异常, userId: {}, corpinfoId: {}", userId, corpinfoId, e);
@@ -466,8 +471,36 @@ public class UserUpdateExe {
                 allJob.add(userJobHandoverDO);
             });
         }
+        //风险辨识检查
+        ListManagerQry listManagerQry = new ListManagerQry();
+        listManagerQry.setUserId(userId);
+        listManagerQry.setCorpinfoId(corpinfoId);
+        List<ListManagerListByUserCO> riskManagerCOList = null;
+        try {
+            log.info("获取用户风险辨识检查信息, userId: {}, corpinfoId: {}", userId, corpinfoId);
+            MultiResponse<ListManagerListByUserCO> riskManagerCOResponse = zcloudRiskFacade.listManagerByUserId(listManagerQry);
+            log.info("获取用户风险辨识检查信息返回, userId: {}, corpinfoId: {}, data: {}", userId, corpinfoId, JSONUtil.toJsonStr(riskManagerCOResponse));
+            riskManagerCOList = riskManagerCOResponse.getData();
+        } catch (Exception e) {
+            log.error("获取用户风险辨识检查信息异常, userId: {}, corpinfoId: {}", userId, corpinfoId, e);
+        }
+        if (CollUtil.isNotEmpty(riskManagerCOList)) {
+            riskManagerCOList.forEach(info -> {
+                UserJobHandoverDO userJobHandoverDO = new UserJobHandoverDO();
+                userJobHandoverDO.setUserJobHandoverId(Tools.get32UUID());
+                userJobHandoverDO.setUserId(userId);
+                userJobHandoverDO.setWorkProject(info.getWorkProject());
+                userJobHandoverDO.setWorkContent(info.getWorkContent());
+                userJobHandoverDO.setForeignKey(info.getListManagerId());
+                userJobHandoverDO.setWorkType(UserJobHandoverWorkTypeEnum.RISK.getCode());
+                userJobHandoverDO.setUserChangeRecordId(userChangeRecordId);
+                userJobHandoverDO.setCorpinfoId(corpinfoId);
+                allJob.add(userJobHandoverDO);
+            });
+        }
         return allJob;
     }
+
     private void ResignatioChangeJob(List<UserJobHandoverDO> allJob) {
         allJob.forEach(info -> {
             //取消工作
@@ -482,12 +515,19 @@ public class UserUpdateExe {
                     userJobHandoverRepository.processUserJobHandover(info.getUserChangeRecordId());
                     //隐患出异常是直接抛异常
                     break;
+                case RISK:
+                    ListManagerStatusUpdateCmd riskCmd = new ListManagerStatusUpdateCmd();
+                    riskCmd.setUserId(info.getUserId());
+                    riskCmd.setCorpinfoId(info.getCorpinfoId());
+                    zcloudRiskFacade.updateListManagerStatusByUserId(riskCmd);
+                    userJobHandoverRepository.processUserJobHandover(info.getUserChangeRecordId());
+                    //风险辨识检查出异常是直接抛异常
+                    break;
             }
 
         });
 
 
-
     }
 
 

web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserJobHandoverWorkTypeEnum.java

@@ -11,6 +11,7 @@ public enum UserJobHandoverWorkTypeEnum {
      * 工作类型，1:隐患信息
      */
      HIDDENINFO(1,"隐患信息"),
+     RISK(2,"风险辨识检查"),
 
 
 ;