Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -7,6 +7,7 @@
 package com.netease.mail.yanxuan.change.biz.biz;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,6 +59,9 @@ import com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemVO;
 import com.netease.mail.yanxuan.change.integration.flow.FlowRpcService;
 import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 import com.netease.yanxuan.flowx.sdk.meta.dto.base.FlowDataDTO;
+import com.netease.yanxuan.flowx.sdk.meta.dto.base.UserReachDTO;
+import com.netease.yanxuan.flowx.sdk.meta.dto.exec.InterfaceInputDTO;
+import com.netease.yanxuan.flowx.sdk.meta.dto.exec.UserBaseContainerDTO;
 import com.netease.yanxuan.flowx.sdk.meta.dto.flow.FlowCreateReqDTO;
 import com.netease.yanxuan.flowx.sdk.meta.dto.flow.NodeSubmitReqDTO;
 
@@ -469,4 +473,23 @@ public class ChangeFlowBiz {
         }
         return new PageInfo<>(list);
     }
+
+    public UserBaseContainerDTO getOperator(InterfaceInputDTO interfaceInput) {
+        log.info("[getOperator] interfaceInput:{}", JSON.toJSONString(interfaceInput));
+        // 根据工单flowId获取审批人，创建工单时设置，唯一
+        String flowId = interfaceInput.getPublicFieldDTO().getFlowMeta().getFlowId();
+        String nodeId = interfaceInput.getPublicFieldDTO().getFlowMeta().getCurrNodeDataList().get(0).getNodeId();
+        ChangeRecord changeRecord = changeFlowService.getByFlowId(Long.valueOf(flowId));
+        String changeCommander = changeRecord.getChangeCommander();
+        if (null == changeCommander) {
+            throw ExceptionFactory.createBiz(ResponseCode.OPERATOR_NOT_EXIST, ResponseCode.OPERATOR_NOT_EXIST.getMsg());
+        }
+        UserReachDTO userReachDTO = new UserReachDTO();
+        userReachDTO.setUserName(changeCommander);
+        userReachDTO.setUid(changeCommander);
+        List<UserReachDTO> totalUserList = Arrays.asList(userReachDTO);
+        UserBaseContainerDTO userBaseContainer = new UserBaseContainerDTO();
+        userBaseContainer.setUserList(totalUserList);
+        return userBaseContainer;
+    }
 }

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/bean/ResponseCode.java

@@ -129,6 +129,7 @@ public enum ResponseCode {
     NO_AUTH(1005, "没有当前节点操作权限"),
     CHANGE_SUBJECT_ERROR(1006, "变更主体类型错误"),
     CHANGE_TYPE_NOT_EXIST(1007, "变更类型不存在"),
+    OPERATOR_NOT_EXIST(1008, "操作人不存在"),
 
     /**
      * 无权限

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java

@@ -22,13 +22,15 @@ import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz;
 import com.netease.mail.yanxuan.change.biz.config.TitleConfig;
 import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
-import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
+import com.netease.mail.yanxuan.change.common.util.DateUtils;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowSubmitReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.BasicChangeFlowVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowVO;
+import com.netease.yanxuan.flowx.sdk.meta.dto.exec.InterfaceInputDTO;
+import com.netease.yanxuan.flowx.sdk.meta.dto.exec.UserBaseContainerDTO;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -153,4 +155,14 @@ public class ChangeFlowController {
 
         return AjaxResult.success();
     }
+
+    /**
+     * 获取审批人
+     * @param interfaceInput
+     * @return
+     */
+    @PostMapping("/getOperator")
+    public AjaxResult<UserBaseContainerDTO> getOperator(@RequestBody InterfaceInputDTO interfaceInput) {
+        return AjaxResult.success(changeFlowBiz.getOperator(interfaceInput));
+    }
 }
\ No newline at end of file