feat: 行动项绑定工单系统

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

@@ -8,8 +8,6 @@ package com.netease.mail.yanxuan.change.biz.service;
 
 import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 
 /**
@@ -75,6 +73,11 @@ public class ChangeFlowExportQuery {
     private Integer createSource;
 
     /**
+     * 创建供应商（同舟端创建）
+     */
+    private String createSupplier;
+
+    /**
      * 服务编码 yanxuan-qc-change-flow
      */
     protected String serviceCode;

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/ChangeFlowExecServiceImpl.java

@@ -39,7 +39,8 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
                     .changeExecUser(c.getChangeExecUser()).changeExecUserEmail(c.getChangeExecUserEmail())
                     .changeRiskDesc(c.getChangeRiskDesc()).changeExecProject(c.getChangeExecProject())
                     .changeChecking(c.getChangeChecking()).changeExecFinishTime(c.getChangeExecFinishTime())
-                    .changeExecFinishDesc(c.getChangeExecFinishDesc()).build())
+                    .changeExecFinishDesc(c.getChangeExecFinishDesc())
+                    .subFlowId(c.getSubFlowId()).subFlowNode(c.getSubFlowNode()).build())
                 .collect(Collectors.toList());
         }
         return new ArrayList<>();

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowRequest.java

@@ -72,6 +72,11 @@ public class ChangeFlowRequest {
      */
     private Integer createSource;
 
+    /**
+     * 创建供应商（同舟端创建）
+     */
+    private String createSupplier;
+
     private String serviceCode;
 
     private String uid;

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ChangeFlowExecVO.java

@@ -79,4 +79,14 @@ public class ChangeFlowExecVO {
      * 行动完成情况
      */
     private String changeExecFinishDesc;
+
+    /**
+     * 子流程工单ID
+     */
+    private String subFlowId;
+
+    /**
+     * 子流程当前节点
+     */
+    private String subFlowNode;
 }
\ No newline at end of file

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

@@ -113,15 +113,16 @@ public class ChangeFlowController {
         changeFlowListQueryReq.setEndTime(endTime);
         changeFlowListQueryReq.setFlowId(flowId);
         // QC端/协同中心可以查看所有，不加入过滤条件
-        if (!CreateSourceEnum.QC.getType().equals(createSource)
-                && !CreateSourceEnum.COLLABORATION_CENTER.getType().equals(createSource)) {
-            changeFlowListQueryReq.setCreateSource(createSource);
-        }
-        if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
+        if (CreateSourceEnum.QC.getType().equals(createSource)
+                || CreateSourceEnum.COLLABORATION_CENTER.getType().equals(createSource)) {
+            // 不设置 createSource，可以查看所有
+        } else if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
             Assert.isTrue(Strings.isNotBlank(supplier), "同舟端查询供应商id不可为空");
             changeFlowListQueryReq.setCreateSource(createSource);
             changeFlowListQueryReq.setSupplier(null);
             changeFlowListQueryReq.setCreateSupplier(supplier);
+        } else {
+            changeFlowListQueryReq.setCreateSource(createSource);
         }
         return AjaxResult.success(changeFlowBiz.query(page, pageSize, changeFlowListQueryReq));
     }
@@ -222,12 +223,16 @@ public class ChangeFlowController {
         changeFlowRequest.setServiceCode(serviceCode);
         changeFlowRequest.setFlowId(flowId);
         // QC端/协同中心可以查看所有，不加入过滤条件
-        if (!CreateSourceEnum.QC.getType().equals(createSource)
-            && !CreateSourceEnum.COLLABORATION_CENTER.getType().equals(createSource)) {
-            changeFlowRequest.setCreateSource(createSource);
-        }
-        if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
+        if (CreateSourceEnum.QC.getType().equals(createSource)
+                || CreateSourceEnum.COLLABORATION_CENTER.getType().equals(createSource)) {
+            // 不设置 createSource，可以查看所有
+        } else if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
             Assert.isTrue(Strings.isNotBlank(supplier), "同舟端查询供应商id不可为空");
+            changeFlowRequest.setCreateSource(createSource);
+            changeFlowRequest.setSupplier(null);
+            changeFlowRequest.setCreateSupplier(supplier);
+        } else {
+            changeFlowRequest.setCreateSource(createSource);
         }
         String s = this.exportAddressBook(changeFlowRequest);
         return AjaxResult.success(s);