更新

src/main/resources/SubProcessStandard.bpmn

@@ -9,11 +9,13 @@
         </completionCondition>
       </multiInstanceLoopCharacteristics>
       <startEvent id="SubStartEvent" name="SubStartEvent"/>
-      <userTask activiti:assignee="${group}" activiti:exclusive="true" id="DataEnter" name="DataEnter"/>
+      <userTask activiti:candidateGroups="${group}" activiti:exclusive="true" id="DataEnter" name="DataEnter">
+        <documentation id="_8_D_1"/>
+      </userTask>
       <sequenceFlow id="_2" sourceRef="SubStartEvent" targetRef="DataEnter"/>
       <exclusiveGateway gatewayDirection="Unspecified" id="Gateway_1"/>
       <sequenceFlow id="_5" sourceRef="DataEnter" targetRef="Gateway_1"/>
-      <userTask activiti:assignee="${auditUser}" activiti:exclusive="true" id="DataAudit" name="DataAuditEvent"/>
+      <userTask activiti:assignee="${auditUser}" activiti:async="false" activiti:exclusive="false" id="DataAudit" name="DataAuditEvent"/>
       <sequenceFlow id="_7" sourceRef="Gateway_1" targetRef="DataAudit">
         <conditionExpression xsi:type="tFormalExpression">
           <![CDATA[${NeedDataAudit == true}]]>

src/main/resources/application-test.yml

@@ -31,9 +31,9 @@ spring:
     url: jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: test
     password: test
-    #    url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
-    #    username: root
-    #    password: 123456
+#    url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+#    username: root
+#    password: 123456
     hikari:
       maximum-pool-size: 3
   servlet:
@@ -42,7 +42,7 @@ spring:
       max-request-size: 100Mb
   redis:
     host: 192.168.0.192
-    #    host: 127.0.0.1
+#    host: 127.0.0.1
     port: 6379
   session:
     store-type: redis
@@ -54,7 +54,7 @@ server:
   port: 8110
 
 app:
-  default-bpmn-file: MoreSubProcessStandard.bpmn
+  default-bpmn-file: SubProcessStandard.bpmn
 
 swagger2:
   host: 192.168.0.240:8762/api/datacollector

src/main/resources/bootstrap.yml

@@ -3,4 +3,4 @@ spring:
     name: dataCollector
 
 app:
-  default-bpmn-file: MoreSubProcessStandard.bpmn
\ No newline at end of file
+  default-bpmn-file: SubProcessStandard.bpmn
\ No newline at end of file

src/test/java/com/keymobile/ProcessTest.java

@@ -11,6 +11,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.IdentityLink;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang.StringUtils;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -102,7 +103,7 @@ public class ProcessTest {
 
     }
 
-//    @Test
+    //    @Test
     public void start() {
 
 //        65046
@@ -168,7 +169,7 @@ public class ProcessTest {
 
     }
 
-//    @Test
+    //    @Test
     public void zhuguan() {
 //        try {
 
@@ -236,9 +237,14 @@ public class ProcessTest {
 //            taskService.complete("60039", ImmutableMap.of("DataAudit", true, "NeedDataAudit", true,"auditUser","asdsa", "NeedConfirm", false, "NeedDataBack", false));
 //            taskService.claim("60039", "asdsadsadsa");
 //            taskService.complete("67504", ImmutableMap.of( "NeedDataAudit", true,"auditUser","asdsa"));
-            taskService.complete("70003", ImmutableMap.of( "DataAudit", false));
+//            taskService.complete("295003", ImmutableMap.of( "NeedDataAudit", false, "NeedConfirm", false));
+
+
 
 
+             taskService.complete("340009", ImmutableMap.of("Confirm", true));
+//            taskService.complete("337525", ImmutableMap.of("NeedDataAudit", false));
+//            taskService.complete("337532", ImmutableMap.of("NeedDataAudit", false, "NeedConfirm", true, "manager", "abcaisdas"));
 
         } catch (Exception e) {
             e.printStackTrace();