调整审核流

jyzb-biz/src/main/java/com/junmp/jyzb/listener/CounterSignListener.java

@@ -200,10 +200,7 @@ public class CounterSignListener implements ExecutionListener {
             if (assigneeList.size()!=0)
              {
                  execution.setVariable(variable, assigneeList);
-//                 execution.setVariable("candidateGroups", assigneeList);
-                 userTask.setCandidateGroups(assigneeList);
-                 userTask.setAssignee(null);  // 清除原有的 assignee，因为你现在是设置候选组
-//                 execution.setVariable("currentAssignee", assigneeList);
+                 execution.setVariable("currentAssignee", assigneeList);
                  //为流程进行中的单据设置审核信息
                 String orderType= execution.getVariable("orderType").toString();
                 if (orderType.equals("workOrder"))

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowInstanceServiceImpl.java

@@ -191,7 +191,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
             for (Task a:list) {
                 System.out.println("a = " + a);
             }
-            Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list().get(0);
             task.setAssignee(StartUser.getUserId().toString());
             return  processInstance.getProcessInstanceId();
 

jyzb-process/src/main/java/com/junmp/junmpProcess/utils/BpmnConvert.java

@@ -2,7 +2,6 @@ package com.junmp.junmpProcess.utils;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.junmp.junmpProcess.dto.json.flowJson.Inout;
 import com.junmp.junmpProcess.entity.ProcessTemplates;
 import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
@@ -193,18 +192,6 @@ public class BpmnConvert {
         userTask.setId(id);
         //写入节点名称
         userTask.setName(node.get("name").asText());
-
-        // 设置候选用户组（Candidate Groups）
-        ArrayNode candidateGroups = (ArrayNode) node.get("candidateGroups");
-        if (candidateGroups != null && candidateGroups.size() > 0) {
-            List<String> candidateGroupList = new ArrayList<>();
-            for (JsonNode group : candidateGroups) {
-                candidateGroupList.add(group.asText());
-            }
-            userTask.setCandidateGroups(candidateGroupList);
-        }
-
-
         ObjectMapper objectMapper = new ObjectMapper();
         JsonNode[] approverGroups = objectMapper.convertValue(node.get("approverGroups"), JsonNode[].class);
         userTask.setExecutionListeners(getTaskListeners());//角色监听
@@ -216,12 +203,9 @@ public class BpmnConvert {
         // 迭代集合
         multiInstanceLoopCharacteristics.setElementVariable("assigneeName");
         // 串行
-        multiInstanceLoopCharacteristics.setSequential(false); // 并行流程
-        multiInstanceLoopCharacteristics.setInputDataItem("${assigneeList}"); // 输入参数，可以是候选组成员列表
-        multiInstanceLoopCharacteristics.setCompletionCondition("${nrOfCompletedInstances/nrOfInstances >=1}");
+        multiInstanceLoopCharacteristics.setSequential(false);
+        multiInstanceLoopCharacteristics.setCompletionCondition("${true}");
         userTask.setAssignee("${assigneeName}");
-//        userTask.setCandidateGroups("${assigneeName}");
-//        userTask.setCandidateGroups(Arrays.asList("group1", "group2")); // 设置候选组
 //         设置多实例属性
         userTask.setLoopCharacteristics(multiInstanceLoopCharacteristics);
         process.addFlowElement(userTask);