自定义流程接口新增

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/FlowViewResult.java

@@ -32,6 +32,15 @@ public class FlowViewResult implements Serializable {
         this.tfFlowViewLogResultList = tfFlowViewLogResultList;
     }
 
+    public FlowViewResult(FlowTaskResult currFlowTaskResult) {
+        this.currFlowTaskResult = currFlowTaskResult;
+    }
+
+    public FlowViewResult(FlowTaskResult currFlowTaskResult, List<TFFlowViewLogResult> tfFlowViewLogResultList) {
+        this.currFlowTaskResult = currFlowTaskResult;
+        this.tfFlowViewLogResultList = tfFlowViewLogResultList;
+    }
+
     public FlowViewResult(CustomFlowMultipleUserApproveTypeEnum multipleUserApproveType, FlowTaskResult currFlowTaskResult, List<TFFlowViewLogResult> tfFlowViewLogResultList) {
         this.multipleUserApproveType = multipleUserApproveType;
         this.currFlowTaskResult = currFlowTaskResult;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -2294,7 +2294,9 @@ public class ActivitiServiceImpl implements ActivitiService {
         if (Objects.nonNull(tfFlowLogResultList) && tfFlowLogResultList.size() > 0) {
             List<TFFlowViewLogResult> flowViewTaskResultList = gson.fromJson(gson.toJson(tfFlowLogResultList), new TypeToken<List<TFFlowViewLogResult>>() {
             }.getType());
-            if (Objects.nonNull(currFlowTaskResult)) {
+            if (Objects.nonNull(currFlowTaskResult) && currFlowTaskResult.getSetup() <= 0) {
+                return new FlowViewResult(currFlowTaskResult, flowViewTaskResultList);
+            } else if (Objects.nonNull(currFlowTaskResult)) {
                 CustomFlowVarDto customFlowVarDto = gson.fromJson(gson.toJson(agginessMap.get(currFlowTaskResult.getTaskKey())), CustomFlowVarDto.class);
                 String nextApproveUsers = flowViewTaskResultList.get(flowViewTaskResultList.size() - 1).getPendApproveUserName();
                 if (Objects.nonNull(customFlowVarDto.getMultipleUserApproveType()) && customFlowVarDto.getMultipleUserApproveType() == CustomFlowMultipleUserApproveTypeEnum.ORDER) {
@@ -2305,18 +2307,11 @@ public class ActivitiServiceImpl implements ActivitiService {
                     currFlowTaskResult.setApproveUserNames(customFlowVarDto.getApproveUserNames());
                 }
                 return new FlowViewResult(customFlowVarDto.getMultipleUserApproveType(), currFlowTaskResult, flowViewTaskResultList);
-            } else {
-                return new FlowViewResult(flowViewTaskResultList);
             }
         } else {
-            if (Objects.nonNull(currFlowTaskResult)) {
-                CustomFlowVarDto customFlowVarDto = gson.fromJson(gson.toJson(agginessMap.get(currFlowTaskResult.getTaskKey())), CustomFlowVarDto.class);
-                currFlowTaskResult.setApproveUserNames(customFlowVarDto.getApproveUserNames());
-                return new FlowViewResult(customFlowVarDto.getMultipleUserApproveType(), currFlowTaskResult, null);
-            } else {
-                return null;
-            }
+            return new FlowViewResult(currFlowTaskResult);
         }
+        return null;
     }
 
     /**