update 集成统一代办

laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java

@@ -36,7 +36,7 @@ public class HiworkTodo {
     private String taskId;
     @ApiModelProperty(value = "节点名称")
     private String taskName;
-    @ApiModelProperty(value = "是否会签")
+    @ApiModelProperty(value = "是否进入下一节点（0是 1不是）")
     private Integer multiInstance;
     @ApiModelProperty(value = "节点编号")
     private String nodeBusiCode;

laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java

@@ -142,7 +142,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
         ProcessNode processNode = processNodeService.getOne(wrapper,false);
         if(!Objects.isNull(processNode)){
             if(processNode.getNodeName().contains("会签")){
-                hiworkTodo.setMultiInstance(1);
+
             }
             hiworkTodo.setNodeBusiCode(processNode.getXmlNodeId());
             // 是否显示（0否，1是）
@@ -192,7 +192,14 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
             hiworkTodo.setUserName(sysUser.getRealname());
         }
         hiworkTodo.setReceiveTime(Instant.now());
-        hiworkTodo.setIsTodo(String.valueOf(processApprovalRecord.getFinishFlag()));
+        //2已完成时进入下一节点
+        Integer finishFlag = processApprovalRecord.getFinishFlag();
+        if (finishFlag.equals(2)){
+            hiworkTodo.setMultiInstance(0);
+        }else {
+            hiworkTodo.setMultiInstance(1);
+        }
+        hiworkTodo.setIsTodo(String.valueOf(finishFlag));
         hiworkTodoList.add(hiworkTodo);
     }
 }