修改设计json解析

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowwork/WorkflowWorkController.java

@@ -115,4 +115,15 @@ public class WorkflowWorkController {
         return success(workflowWorkService.updateNodeApproval(vo));
     }
 
+    // -------------------------------admin-------------------------------------------------
+    @GetMapping("/getAdminWorkPage")
+    @Operation(summary = "管理员任务管理(显示全部数据)")
+    @PreAuthorize("@ss.hasPermission('iscs:workflow-work:query')")
+    public CommonResult<PageResult<MyWorkRespVO>> getAdminWorkPage(@Valid MyWorkReqVO vo) {
+        PageResult<MyWorkRespVO> pageResult = workflowWorkService.getAdminWorkPage(vo);
+        return success(pageResult);
+    }
+
+
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworknode/WorkflowWorkNodeController.java

@@ -1,11 +1,8 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode;
 
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeSaveReqVO;
@@ -15,16 +12,11 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 作业节点")

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/workdesign/WorkflowDesignNodeDO.java

@@ -106,6 +106,17 @@ public class WorkflowDesignNodeDO extends BaseDO {
      * 通知时间策略
      */
     private String notifyTime;
-
+    /**
+     * 隔离方式
+     */
+    private String isolationType;
+    /**
+     * 隔离点
+     */
+    private String isolationPoints;
+    /**
+     * 隔离节点ID
+     */
+    private String isolationNodeUuid;
 
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/workdesign/WorkflowWorkMapper.java

@@ -55,4 +55,7 @@ public interface WorkflowWorkMapper extends BaseMapperX<WorkflowWorkDO> {
                                 @Param(value = "endTime") LocalDateTime endTime);
 
 
+    Page<MyWorkRespVO> getAdminWorkPage(Page page, @Param(value = "vo") MyWorkReqVO vo);
+
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowDesignNodeServiceImpl.java

@@ -137,8 +137,13 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                     String data = node.get("data").toString();
                     String remark = node.get("data").get("remark") != null ? node.get("data").get("remark").asText() : null;
                     String formId = node.get("data").get("formId") != null ? node.get("data").get("formId").asText() : null;
-                    System.out.printf("节点%d: uuid=%s, nodeName=%s, nodeIcon=%s, 类型=%s, position=%s, data=%s, 标签=%s, 表单=%s%n",
-                            ++index, uuid, nodeName, nodeIcon, type, position, data, remark, formId);
+                    String workerUserId = node.get("data").get("workerUserId") != null ? node.get("data").get("workerUserId").asText() : null;
+                    String isolationType = node.get("data").get("isolationType") != null ? node.get("data").get("isolationType").asText() : null;
+                    String isolationPoints = node.get("data").get("isolationPoints") != null ? node.get("data").get("isolationPoints").toString() : null;
+                    String isolationNodeUuid = node.get("data").get("isolationNodeUuid") != null ? node.get("data").get("isolationNodeUuid").asText() : null;
+
+                    System.out.printf("节点%d: uuid=%s, nodeName=%s, nodeIcon=%s, 类型=%s, position=%s, data=%s, 标签=%s, 表单=%s, 负责人=%s, 隔离类型=%s, 隔离点=%s, 隔离点Uuid=%s%n",
+                            ++index, uuid, nodeName, nodeIcon, type, position, data, remark, formId, workerUserId, isolationType, isolationPoints, isolationNodeUuid);
                     WorkflowDesignNodeDO workflowDesignNodeDO = new WorkflowDesignNodeDO();
                     workflowDesignNodeDO.setUuid(uuid);
                     workflowDesignNodeDO.setNodeName(nodeName);
@@ -147,6 +152,10 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                     workflowDesignNodeDO.setPosition(position);
                     workflowDesignNodeDO.setData(data);
                     workflowDesignNodeDO.setFormId(StringUtils.isNotBlank(formId) ? Long.valueOf(formId) : null);
+                    workflowDesignNodeDO.setWorkerUserId(StringUtils.isNotBlank(workerUserId) ? Long.valueOf(workerUserId) : null);
+                    workflowDesignNodeDO.setIsolationType(StringUtils.isNotBlank(isolationType) ? isolationType : null);
+                    workflowDesignNodeDO.setIsolationPoints(StringUtils.isNotBlank(isolationPoints) && !"[]".equals(isolationPoints) ? isolationPoints : null);
+                    workflowDesignNodeDO.setIsolationNodeUuid(StringUtils.isNotBlank(isolationNodeUuid) ? isolationNodeUuid : null);
                     // 处理关系字段
                     PcValueVO pcValueVO = pcValueMap.get(uuid);
                     if (pcValueVO != null) {
@@ -166,147 +175,91 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
     public static void main(String[] args) {
 
         String aa = "{\n" +
-                "  \"generatedAt\": \"2025-12-18T08:36:23.787Z\",\n" +
-                "  \"nodeCount\": 14,\n" +
-                "  \"edgeCount\": 16,\n" +
+                "  \"nodeCount\": 8,\n" +
+                "  \"edgeCount\": 7,\n" +
                 "  \"adjacency\": {\n" +
-                "    \"createJob-1766023817148\": {\n" +
-                "      \"parentUuid\": [\n" +
-                "        \"confirm-1766023821012\"\n" +
-                "      ],\n" +
-                "      \"childrenUuid\": []\n" +
-                "    },\n" +
-                "    \"confirm-1766023821012\": {\n" +
-                "      \"parentUuid\": [\n" +
-                "        \"review-1766023825604\"\n" +
-                "      ],\n" +
-                "      \"childrenUuid\": [\n" +
-                "        \"createJob-1766023817148\"\n" +
-                "      ]\n" +
-                "    },\n" +
-                "    \"review-1766023825604\": {\n" +
-                "      \"parentUuid\": [\n" +
-                "        \"inputInfo-1766023831636\",\n" +
-                "        \"inputInfo-1766023848740\"\n" +
-                "      ],\n" +
-                "      \"childrenUuid\": [\n" +
-                "        \"confirm-1766023821012\"\n" +
-                "      ]\n" +
-                "    },\n" +
-                "    \"inputInfo-1766023831636\": {\n" +
-                "      \"parentUuid\": [\n" +
-                "        \"isolation-1766023834331\",\n" +
-                "        \"isolation-1766023839756\",\n" +
-                "        \"isolation-1766023837357\"\n" +
-                "      ],\n" +
-                "      \"childrenUuid\": [\n" +
-                "        \"review-1766023825604\"\n" +
-                "      ]\n" +
-                "    },\n" +
-                "    \"isolation-1766023834331\": {\n" +
-                "      \"parentUuid\": [\n" +
-                "        \"releaseIsolation-1766023890300\"\n" +
-                "      ],\n" +
-                "      \"childrenUuid\": [\n" +
-                "        \"inputInfo-1766023831636\"\n" +
-                "      ]\n" +
-                "    },\n" +
-                "    \"isolation-1766023837357\": {\n" +
-                "      \"parentUuid\": [\n" +
-                "        \"releaseIsolation-1766023887325\"\n" +
-                "      ],\n" +
+                "    \"createJob-1766650792290\": {\n" +
+                "      \"parentUuid\": [],\n" +
                 "      \"childrenUuid\": [\n" +
-                "        \"inputInfo-1766023831636\"\n" +
+                "        \"confirm-1766650799337\"\n" +
                 "      ]\n" +
                 "    },\n" +
-                "    \"isolation-1766023839756\": {\n" +
+                "    \"confirm-1766650799337\": {\n" +
                 "      \"parentUuid\": [\n" +
-                "        \"releaseIsolation-1766023893308\"\n" +
+                "        \"createJob-1766650792290\"\n" +
                 "      ],\n" +
                 "      \"childrenUuid\": [\n" +
-                "        \"inputInfo-1766023831636\"\n" +
+                "        \"review-1766650839450\"\n" +
                 "      ]\n" +
                 "    },\n" +
-                "    \"inputInfo-1766023848740\": {\n" +
+                "    \"review-1766650839450\": {\n" +
                 "      \"parentUuid\": [\n" +
-                "        \"confirm-1766023875733\"\n" +
+                "        \"confirm-1766650799337\"\n" +
                 "      ],\n" +
                 "      \"childrenUuid\": [\n" +
-                "        \"review-1766023825604\"\n" +
+                "        \"inputInfo-1766650850963\"\n" +
                 "      ]\n" +
                 "    },\n" +
-                "    \"confirm-1766023875733\": {\n" +
+                "    \"inputInfo-1766650850963\": {\n" +
                 "      \"parentUuid\": [\n" +
-                "        \"complete-1766023921996\"\n" +
+                "        \"review-1766650839450\"\n" +
                 "      ],\n" +
                 "      \"childrenUuid\": [\n" +
-                "        \"inputInfo-1766023848740\"\n" +
+                "        \"isolation-1766650858056\"\n" +
                 "      ]\n" +
                 "    },\n" +
-                "    \"releaseIsolation-1766023887325\": {\n" +
+                "    \"isolation-1766650858056\": {\n" +
                 "      \"parentUuid\": [\n" +
-                "        \"returnLock-1766023906693\"\n" +
+                "        \"inputInfo-1766650850963\"\n" +
                 "      ],\n" +
                 "      \"childrenUuid\": [\n" +
-                "        \"isolation-1766023837357\"\n" +
+                "        \"releaseIsolation-1766650866562\"\n" +
                 "      ]\n" +
                 "    },\n" +
-                "    \"releaseIsolation-1766023890300\": {\n" +
+                "    \"releaseIsolation-1766650866562\": {\n" +
                 "      \"parentUuid\": [\n" +
-                "        \"returnLock-1766023906693\"\n" +
+                "        \"isolation-1766650858056\"\n" +
                 "      ],\n" +
                 "      \"childrenUuid\": [\n" +
-                "        \"isolation-1766023834331\"\n" +
+                "        \"returnLock-1766650872321\"\n" +
                 "      ]\n" +
                 "    },\n" +
-                "    \"releaseIsolation-1766023893308\": {\n" +
+                "    \"returnLock-1766650872321\": {\n" +
                 "      \"parentUuid\": [\n" +
-                "        \"returnLock-1766023906693\"\n" +
+                "        \"releaseIsolation-1766650866562\"\n" +
                 "      ],\n" +
                 "      \"childrenUuid\": [\n" +
-                "        \"isolation-1766023839756\"\n" +
+                "        \"complete-1766650878643\"\n" +
                 "      ]\n" +
                 "    },\n" +
-                "    \"returnLock-1766023906693\": {\n" +
+                "    \"complete-1766650878643\": {\n" +
                 "      \"parentUuid\": [\n" +
-                "        \"complete-1766023921996\"\n" +
+                "        \"returnLock-1766650872321\"\n" +
                 "      ],\n" +
-                "      \"childrenUuid\": [\n" +
-                "        \"releaseIsolation-1766023887325\",\n" +
-                "        \"releaseIsolation-1766023890300\",\n" +
-                "        \"releaseIsolation-1766023893308\"\n" +
-                "      ]\n" +
-                "    },\n" +
-                "    \"complete-1766023921996\": {\n" +
-                "      \"parentUuid\": [],\n" +
-                "      \"childrenUuid\": [\n" +
-                "        \"returnLock-1766023906693\",\n" +
-                "        \"confirm-1766023875733\"\n" +
-                "      ]\n" +
+                "      \"childrenUuid\": []\n" +
                 "    }\n" +
                 "  },\n" +
                 "  \"nodes\": [\n" +
                 "    {\n" +
-                "      \"uuid\": \"createJob-1766023817148\",\n" +
+                "      \"uuid\": \"createJob-1766650792290\",\n" +
                 "      \"type\": \"createJob\",\n" +
                 "      \"position\": {\n" +
-                "        \"x\": -179.37266858064675,\n" +
-                "        \"y\": 114.01624952893374\n" +
+                "        \"x\": 7,\n" +
+                "        \"y\": 68.23812170331226\n" +
                 "      },\n" +
                 "      \"nodeName\": \"创建作业\",\n" +
-                "      \"nodeIcon\": \"createJob\",\n" +
+                "      \"nodeIcon\": \"2007.png\",\n" +
                 "      \"data\": {\n" +
                 "        \"label\": \"创建作业\",\n" +
                 "        \"type\": \"createJob\",\n" +
                 "        \"nodeId\": \"001\",\n" +
-                "        \"icon\": \"createJob\",\n" +
-                "        \"responsible\": \"\",\n" +
+                "        \"icon\": \"2007.png\",\n" +
                 "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
+                "        \"formId\": \"\",\n" +
+                "        \"isolationType\": \"\",\n" +
                 "        \"isolationPoints\": [],\n" +
                 "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
                 "        \"lockPerson\": \"\",\n" +
                 "        \"coLockPersons\": [],\n" +
                 "        \"notificationMethods\": {\n" +
@@ -316,30 +269,33 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                 "          \"app\": false\n" +
                 "        },\n" +
                 "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"创建作业\",\n" +
+                "        \"nodeIcon\": \"2007.png\",\n" +
+                "        \"workerUserId\": \"\"\n" +
                 "      }\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"uuid\": \"confirm-1766023821012\",\n" +
+                "      \"uuid\": \"confirm-1766650799337\",\n" +
                 "      \"type\": \"confirm\",\n" +
                 "      \"position\": {\n" +
-                "        \"x\": 12.385394707410981,\n" +
-                "        \"y\": 113.1978387386558\n" +
+                "        \"x\": 161.5550901336875,\n" +
+                "        \"y\": 69.20567280036369\n" +
                 "      },\n" +
                 "      \"nodeName\": \"确认\",\n" +
-                "      \"nodeIcon\": \"confirm\",\n" +
+                "      \"nodeIcon\": \"4005.png\",\n" +
                 "      \"data\": {\n" +
                 "        \"label\": \"确认\",\n" +
                 "        \"type\": \"confirm\",\n" +
                 "        \"nodeId\": \"002\",\n" +
-                "        \"icon\": \"confirm\",\n" +
-                "        \"responsible\": \"\",\n" +
+                "        \"icon\": \"4005.png\",\n" +
                 "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
+                "        \"formId\": \"54\",\n" +
+                "        \"isolationType\": \"\",\n" +
                 "        \"isolationPoints\": [],\n" +
                 "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
                 "        \"lockPerson\": \"\",\n" +
                 "        \"coLockPersons\": [],\n" +
                 "        \"notificationMethods\": {\n" +
@@ -349,30 +305,33 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                 "          \"app\": false\n" +
                 "        },\n" +
                 "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"submitForm\": 55,\n" +
+                "        \"nodeName\": \"确认\",\n" +
+                "        \"nodeIcon\": \"4005.png\",\n" +
+                "        \"workerUserId\": \"\"\n" +
                 "      }\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"uuid\": \"review-1766023825604\",\n" +
+                "      \"uuid\": \"review-1766650839450\",\n" +
                 "      \"type\": \"review\",\n" +
                 "      \"position\": {\n" +
-                "        \"x\": 174.30779948049008,\n" +
-                "        \"y\": 114.0683893019519\n" +
+                "        \"x\": 307.95371541828086,\n" +
+                "        \"y\": 71.82960203124719\n" +
                 "      },\n" +
                 "      \"nodeName\": \"审核\",\n" +
-                "      \"nodeIcon\": \"review\",\n" +
+                "      \"nodeIcon\": \"1004.png\",\n" +
                 "      \"data\": {\n" +
                 "        \"label\": \"审核\",\n" +
                 "        \"type\": \"review\",\n" +
                 "        \"nodeId\": \"003\",\n" +
-                "        \"icon\": \"review\",\n" +
-                "        \"responsible\": \"\",\n" +
+                "        \"icon\": \"1004.png\",\n" +
                 "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
+                "        \"formId\": \"54\",\n" +
+                "        \"isolationType\": \"\",\n" +
                 "        \"isolationPoints\": [],\n" +
                 "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
                 "        \"lockPerson\": \"\",\n" +
                 "        \"coLockPersons\": [],\n" +
                 "        \"notificationMethods\": {\n" +
@@ -382,63 +341,33 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                 "          \"app\": false\n" +
                 "        },\n" +
                 "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"审核\",\n" +
+                "        \"nodeIcon\": \"1004.png\",\n" +
+                "        \"workerUserId\": \"1\"\n" +
                 "      }\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"uuid\": \"inputInfo-1766023831636\",\n" +
+                "      \"uuid\": \"inputInfo-1766650850963\",\n" +
                 "      \"type\": \"inputInfo\",\n" +
                 "      \"position\": {\n" +
-                "        \"x\": 323.1719458041274,\n" +
-                "        \"y\": 117.55059155513635\n" +
+                "        \"x\": 483.731949618194,\n" +
+                "        \"y\": 70.62738352369351\n" +
                 "      },\n" +
                 "      \"nodeName\": \"录入信息\",\n" +
-                "      \"nodeIcon\": \"inputInfo\",\n" +
+                "      \"nodeIcon\": \"3011.png\",\n" +
                 "      \"data\": {\n" +
                 "        \"label\": \"录入信息\",\n" +
                 "        \"type\": \"inputInfo\",\n" +
                 "        \"nodeId\": \"004\",\n" +
-                "        \"icon\": \"inputInfo\",\n" +
-                "        \"responsible\": \"\",\n" +
-                "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
-                "        \"isolationPoints\": [],\n" +
-                "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
-                "        \"lockPerson\": \"\",\n" +
-                "        \"coLockPersons\": [],\n" +
-                "        \"notificationMethods\": {\n" +
-                "          \"sms\": false,\n" +
-                "          \"message\": false,\n" +
-                "          \"email\": false,\n" +
-                "          \"app\": false\n" +
-                "        },\n" +
-                "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
-                "      }\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"uuid\": \"isolation-1766023834331\",\n" +
-                "      \"type\": \"isolation\",\n" +
-                "      \"position\": {\n" +
-                "        \"x\": 498.81722617463026,\n" +
-                "        \"y\": 126.77628558330605\n" +
-                "      },\n" +
-                "      \"nodeName\": \"隔离/方案\",\n" +
-                "      \"nodeIcon\": \"isolation\",\n" +
-                "      \"data\": {\n" +
-                "        \"label\": \"隔离/方案\",\n" +
-                "        \"type\": \"isolation\",\n" +
-                "        \"nodeId\": \"005\",\n" +
-                "        \"icon\": \"isolation\",\n" +
-                "        \"responsible\": \"\",\n" +
+                "        \"icon\": \"3011.png\",\n" +
                 "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
+                "        \"formId\": \"\",\n" +
+                "        \"isolationType\": \"\",\n" +
                 "        \"isolationPoints\": [],\n" +
                 "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
                 "        \"lockPerson\": \"\",\n" +
                 "        \"coLockPersons\": [],\n" +
                 "        \"notificationMethods\": {\n" +
@@ -448,131 +377,41 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                 "          \"app\": false\n" +
                 "        },\n" +
                 "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
-                "      }\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"uuid\": \"isolation-1766023837357\",\n" +
-                "      \"type\": \"isolation\",\n" +
-                "      \"position\": {\n" +
-                "        \"x\": 503.44812678281187,\n" +
-                "        \"y\": 339.5770923838415\n" +
-                "      },\n" +
-                "      \"nodeName\": \"隔离/方案\",\n" +
-                "      \"nodeIcon\": \"isolation\",\n" +
-                "      \"data\": {\n" +
-                "        \"label\": \"隔离/方案\",\n" +
-                "        \"type\": \"isolation\",\n" +
-                "        \"nodeId\": \"006\",\n" +
-                "        \"icon\": \"isolation\",\n" +
-                "        \"responsible\": \"\",\n" +
-                "        \"remark\": \"\",\n" +
+                "        \"notificationTime\": \"\",\n" +
                 "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
-                "        \"isolationPoints\": [],\n" +
-                "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
-                "        \"lockPerson\": \"\",\n" +
-                "        \"coLockPersons\": [],\n" +
-                "        \"notificationMethods\": {\n" +
-                "          \"sms\": false,\n" +
-                "          \"message\": false,\n" +
-                "          \"email\": false,\n" +
-                "          \"app\": false\n" +
-                "        },\n" +
-                "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
+                "        \"nodeName\": \"录入信息\",\n" +
+                "        \"nodeIcon\": \"3011.png\",\n" +
+                "        \"workerUserId\": \"1\"\n" +
                 "      }\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"uuid\": \"isolation-1766023839756\",\n" +
+                "      \"uuid\": \"isolation-1766650858056\",\n" +
                 "      \"type\": \"isolation\",\n" +
                 "      \"position\": {\n" +
-                "        \"x\": 501.8153472207998,\n" +
-                "        \"y\": -62.06097227556609\n" +
+                "        \"x\": 646.7500417706087,\n" +
+                "        \"y\": 59.519748224359944\n" +
                 "      },\n" +
                 "      \"nodeName\": \"隔离/方案\",\n" +
-                "      \"nodeIcon\": \"isolation\",\n" +
+                "      \"nodeIcon\": \"6005.png\",\n" +
                 "      \"data\": {\n" +
                 "        \"label\": \"隔离/方案\",\n" +
                 "        \"type\": \"isolation\",\n" +
-                "        \"nodeId\": \"007\",\n" +
-                "        \"icon\": \"isolation\",\n" +
-                "        \"responsible\": \"\",\n" +
-                "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
-                "        \"isolationPoints\": [],\n" +
-                "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
-                "        \"lockPerson\": \"\",\n" +
-                "        \"coLockPersons\": [],\n" +
-                "        \"notificationMethods\": {\n" +
-                "          \"sms\": false,\n" +
-                "          \"message\": false,\n" +
-                "          \"email\": false,\n" +
-                "          \"app\": false\n" +
-                "        },\n" +
-                "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
-                "      }\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"uuid\": \"inputInfo-1766023848740\",\n" +
-                "      \"type\": \"inputInfo\",\n" +
-                "      \"position\": {\n" +
-                "        \"x\": 173.9287877356881,\n" +
-                "        \"y\": 360.35154707809045\n" +
-                "      },\n" +
-                "      \"nodeName\": \"录入信息\",\n" +
-                "      \"nodeIcon\": \"inputInfo\",\n" +
-                "      \"data\": {\n" +
-                "        \"label\": \"录入信息\",\n" +
-                "        \"type\": \"inputInfo\",\n" +
-                "        \"nodeId\": \"008\",\n" +
-                "        \"icon\": \"inputInfo\",\n" +
-                "        \"responsible\": \"\",\n" +
-                "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
-                "        \"isolationPoints\": [],\n" +
-                "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
-                "        \"lockPerson\": \"\",\n" +
-                "        \"coLockPersons\": [],\n" +
-                "        \"notificationMethods\": {\n" +
-                "          \"sms\": false,\n" +
-                "          \"message\": false,\n" +
-                "          \"email\": false,\n" +
-                "          \"app\": false\n" +
-                "        },\n" +
-                "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
-                "      }\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"uuid\": \"confirm-1766023875733\",\n" +
-                "      \"type\": \"confirm\",\n" +
-                "      \"position\": {\n" +
-                "        \"x\": 175.0774860906851,\n" +
-                "        \"y\": 622.2547720174143\n" +
-                "      },\n" +
-                "      \"nodeName\": \"确认\",\n" +
-                "      \"nodeIcon\": \"confirm\",\n" +
-                "      \"data\": {\n" +
-                "        \"label\": \"确认\",\n" +
-                "        \"type\": \"confirm\",\n" +
-                "        \"nodeId\": \"009\",\n" +
-                "        \"icon\": \"confirm\",\n" +
-                "        \"responsible\": \"\",\n" +
+                "        \"nodeId\": \"005\",\n" +
+                "        \"icon\": \"6005.png\",\n" +
                 "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
-                "        \"isolationPoints\": [],\n" +
+                "        \"formId\": \"53\",\n" +
+                "        \"isolationType\": \"1\",\n" +
+                "        \"isolationPoints\": [\n" +
+                "          105,\n" +
+                "          104\n" +
+                "        ],\n" +
                 "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
-                "        \"lockPerson\": \"\",\n" +
-                "        \"coLockPersons\": [],\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
+                "        \"lockPerson\": 1,\n" +
+                "        \"coLockPersons\": [\n" +
+                "          117,\n" +
+                "          139\n" +
+                "        ],\n" +
                 "        \"notificationMethods\": {\n" +
                 "          \"sms\": false,\n" +
                 "          \"message\": false,\n" +
@@ -580,32 +419,41 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                 "          \"app\": false\n" +
                 "        },\n" +
                 "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"submitForm\": 55,\n" +
+                "        \"nodeName\": \"隔离/方案\",\n" +
+                "        \"nodeIcon\": \"6005.png\",\n" +
+                "        \"workerUserId\": \"\"\n" +
                 "      }\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"uuid\": \"releaseIsolation-1766023887325\",\n" +
+                "      \"uuid\": \"releaseIsolation-1766650866562\",\n" +
                 "      \"type\": \"releaseIsolation\",\n" +
                 "      \"position\": {\n" +
-                "        \"x\": 720.709204714277,\n" +
-                "        \"y\": 353.45935694810817\n" +
+                "        \"x\": 834.569799005354,\n" +
+                "        \"y\": 60.66393270031418\n" +
                 "      },\n" +
                 "      \"nodeName\": \"解除隔离\",\n" +
-                "      \"nodeIcon\": \"releaseIsolation\",\n" +
+                "      \"nodeIcon\": \"7007.png\",\n" +
                 "      \"data\": {\n" +
                 "        \"label\": \"解除隔离\",\n" +
                 "        \"type\": \"releaseIsolation\",\n" +
-                "        \"nodeId\": \"010\",\n" +
-                "        \"icon\": \"releaseIsolation\",\n" +
-                "        \"responsible\": \"\",\n" +
+                "        \"nodeId\": \"006\",\n" +
+                "        \"icon\": \"7007.png\",\n" +
                 "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
-                "        \"isolationPoints\": [],\n" +
+                "        \"formId\": \"55\",\n" +
+                "        \"isolationType\": \"1\",\n" +
+                "        \"isolationPoints\": [\n" +
+                "          105,\n" +
+                "          104\n" +
+                "        ],\n" +
                 "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
-                "        \"lockPerson\": \"\",\n" +
-                "        \"coLockPersons\": [],\n" +
+                "        \"isolationNodeUuid\": \"isolation-1766650858056\",\n" +
+                "        \"lockPerson\": 1,\n" +
+                "        \"coLockPersons\": [\n" +
+                "          117,\n" +
+                "          139\n" +
+                "        ],\n" +
                 "        \"notificationMethods\": {\n" +
                 "          \"sms\": false,\n" +
                 "          \"message\": false,\n" +
@@ -613,96 +461,33 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                 "          \"app\": false\n" +
                 "        },\n" +
                 "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
-                "      }\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"uuid\": \"releaseIsolation-1766023890300\",\n" +
-                "      \"type\": \"releaseIsolation\",\n" +
-                "      \"position\": {\n" +
-                "        \"x\": 727.601394844259,\n" +
-                "        \"y\": 138.65276456366257\n" +
-                "      },\n" +
-                "      \"nodeName\": \"解除隔离\",\n" +
-                "      \"nodeIcon\": \"releaseIsolation\",\n" +
-                "      \"data\": {\n" +
-                "        \"label\": \"解除隔离\",\n" +
-                "        \"type\": \"releaseIsolation\",\n" +
-                "        \"nodeId\": \"011\",\n" +
-                "        \"icon\": \"releaseIsolation\",\n" +
-                "        \"responsible\": \"\",\n" +
-                "        \"remark\": \"\",\n" +
+                "        \"notificationTime\": \"\",\n" +
                 "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
-                "        \"isolationPoints\": [],\n" +
-                "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
-                "        \"lockPerson\": \"\",\n" +
-                "        \"coLockPersons\": [],\n" +
-                "        \"notificationMethods\": {\n" +
-                "          \"sms\": false,\n" +
-                "          \"message\": false,\n" +
-                "          \"email\": false,\n" +
-                "          \"app\": false\n" +
-                "        },\n" +
-                "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
+                "        \"nodeName\": \"解除隔离\",\n" +
+                "        \"nodeIcon\": \"7007.png\",\n" +
+                "        \"workerUserId\": \"\"\n" +
                 "      }\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"uuid\": \"releaseIsolation-1766023893308\",\n" +
-                "      \"type\": \"releaseIsolation\",\n" +
-                "      \"position\": {\n" +
-                "        \"x\": 724.1552997792679,\n" +
-                "        \"y\": -60.072050850824496\n" +
-                "      },\n" +
-                "      \"nodeName\": \"解除隔离\",\n" +
-                "      \"nodeIcon\": \"releaseIsolation\",\n" +
-                "      \"data\": {\n" +
-                "        \"label\": \"解除隔离\",\n" +
-                "        \"type\": \"releaseIsolation\",\n" +
-                "        \"nodeId\": \"012\",\n" +
-                "        \"icon\": \"releaseIsolation\",\n" +
-                "        \"responsible\": \"\",\n" +
-                "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
-                "        \"isolationPoints\": [],\n" +
-                "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
-                "        \"lockPerson\": \"\",\n" +
-                "        \"coLockPersons\": [],\n" +
-                "        \"notificationMethods\": {\n" +
-                "          \"sms\": false,\n" +
-                "          \"message\": false,\n" +
-                "          \"email\": false,\n" +
-                "          \"app\": false\n" +
-                "        },\n" +
-                "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
-                "      }\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"uuid\": \"returnLock-1766023906693\",\n" +
+                "      \"uuid\": \"returnLock-1766650872321\",\n" +
                 "      \"type\": \"returnLock\",\n" +
                 "      \"position\": {\n" +
-                "        \"x\": 975.7202395236187,\n" +
-                "        \"y\": 170.81631850357962\n" +
+                "        \"x\": 1007.425335316603,\n" +
+                "        \"y\": 64.62245643263284\n" +
                 "      },\n" +
                 "      \"nodeName\": \"还锁\",\n" +
-                "      \"nodeIcon\": \"returnLock\",\n" +
+                "      \"nodeIcon\": \"7004.png\",\n" +
                 "      \"data\": {\n" +
                 "        \"label\": \"还锁\",\n" +
                 "        \"type\": \"returnLock\",\n" +
-                "        \"nodeId\": \"013\",\n" +
-                "        \"icon\": \"returnLock\",\n" +
-                "        \"responsible\": \"\",\n" +
+                "        \"nodeId\": \"007\",\n" +
+                "        \"icon\": \"7004.png\",\n" +
                 "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
+                "        \"formId\": \"\",\n" +
+                "        \"isolationType\": \"\",\n" +
                 "        \"isolationPoints\": [],\n" +
                 "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
                 "        \"lockPerson\": \"\",\n" +
                 "        \"coLockPersons\": [],\n" +
                 "        \"notificationMethods\": {\n" +
@@ -712,30 +497,33 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                 "          \"app\": false\n" +
                 "        },\n" +
                 "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"还锁\",\n" +
+                "        \"nodeIcon\": \"7004.png\",\n" +
+                "        \"workerUserId\": \"\"\n" +
                 "      }\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"uuid\": \"complete-1766023921996\",\n" +
+                "      \"uuid\": \"complete-1766650878643\",\n" +
                 "      \"type\": \"complete\",\n" +
                 "      \"position\": {\n" +
-                "        \"x\": 1250.25914636791,\n" +
-                "        \"y\": 176.55981027856473\n" +
+                "        \"x\": 1137.7757716064598,\n" +
+                "        \"y\": 64.5270073367588\n" +
                 "      },\n" +
                 "      \"nodeName\": \"完成/结束\",\n" +
-                "      \"nodeIcon\": \"complete\",\n" +
+                "      \"nodeIcon\": \"5006.png\",\n" +
                 "      \"data\": {\n" +
                 "        \"label\": \"完成/结束\",\n" +
                 "        \"type\": \"complete\",\n" +
-                "        \"nodeId\": \"014\",\n" +
-                "        \"icon\": \"complete\",\n" +
-                "        \"responsible\": \"\",\n" +
+                "        \"nodeId\": \"008\",\n" +
+                "        \"icon\": \"5006.png\",\n" +
                 "        \"remark\": \"\",\n" +
-                "        \"submitForm\": \"\",\n" +
-                "        \"isolationMethod\": \"\",\n" +
+                "        \"formId\": \"\",\n" +
+                "        \"isolationType\": \"\",\n" +
                 "        \"isolationPoints\": [],\n" +
                 "        \"isolationNode\": [],\n" +
-                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
                 "        \"lockPerson\": \"\",\n" +
                 "        \"coLockPersons\": [],\n" +
                 "        \"notificationMethods\": {\n" +
@@ -745,138 +533,70 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
                 "          \"app\": false\n" +
                 "        },\n" +
                 "        \"notificationPerson\": \"\",\n" +
-                "        \"notificationTime\": \"\"\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"完成/结束\",\n" +
+                "        \"nodeIcon\": \"5006.png\",\n" +
+                "        \"workerUserId\": \"\"\n" +
                 "      }\n" +
                 "    }\n" +
                 "  ],\n" +
                 "  \"edges\": [\n" +
                 "    {\n" +
-                "      \"id\": \"edge-confirm-1766023821012-left-source-createJob-1766023817148-right-target-1766023856706\",\n" +
-                "      \"source\": \"confirm-1766023821012\",\n" +
-                "      \"target\": \"createJob-1766023817148\",\n" +
-                "      \"sourceHandle\": \"left-source\",\n" +
-                "      \"targetHandle\": \"right-target\",\n" +
-                "      \"type\": \"straight\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"id\": \"edge-review-1766023825604-left-source-confirm-1766023821012-right-target-1766023858410\",\n" +
-                "      \"source\": \"review-1766023825604\",\n" +
-                "      \"target\": \"confirm-1766023821012\",\n" +
-                "      \"sourceHandle\": \"left-source\",\n" +
-                "      \"targetHandle\": \"right-target\",\n" +
-                "      \"type\": \"straight\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"id\": \"edge-inputInfo-1766023831636-left-source-review-1766023825604-right-target-1766023860242\",\n" +
-                "      \"source\": \"inputInfo-1766023831636\",\n" +
-                "      \"target\": \"review-1766023825604\",\n" +
+                "      \"id\": \"edge-review-1766650839450-left-source-confirm-1766650799337-right-target-1766650842927\",\n" +
+                "      \"source\": \"review-1766650839450\",\n" +
+                "      \"target\": \"confirm-1766650799337\",\n" +
                 "      \"sourceHandle\": \"left-source\",\n" +
                 "      \"targetHandle\": \"right-target\",\n" +
                 "      \"type\": \"straight\"\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"id\": \"edge-isolation-1766023834331-left-source-inputInfo-1766023831636-right-target-1766023864226\",\n" +
-                "      \"source\": \"isolation-1766023834331\",\n" +
-                "      \"target\": \"inputInfo-1766023831636\",\n" +
+                "      \"id\": \"edge-inputInfo-1766650850963-left-source-review-1766650839450-right-target-1766650854567\",\n" +
+                "      \"source\": \"inputInfo-1766650850963\",\n" +
+                "      \"target\": \"review-1766650839450\",\n" +
                 "      \"sourceHandle\": \"left-source\",\n" +
                 "      \"targetHandle\": \"right-target\",\n" +
                 "      \"type\": \"straight\"\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"id\": \"edge-isolation-1766023839756-left-source-inputInfo-1766023831636-top-target-1766023866130\",\n" +
-                "      \"source\": \"isolation-1766023839756\",\n" +
-                "      \"target\": \"inputInfo-1766023831636\",\n" +
-                "      \"sourceHandle\": \"left-source\",\n" +
-                "      \"targetHandle\": \"top-target\",\n" +
-                "      \"type\": \"straight\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"id\": \"edge-isolation-1766023837357-left-source-inputInfo-1766023831636-bottom-target-1766023871330\",\n" +
-                "      \"source\": \"isolation-1766023837357\",\n" +
-                "      \"target\": \"inputInfo-1766023831636\",\n" +
-                "      \"sourceHandle\": \"left-source\",\n" +
-                "      \"targetHandle\": \"bottom-target\",\n" +
-                "      \"type\": \"straight\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"id\": \"edge-inputInfo-1766023848740-top-source-review-1766023825604-bottom-target-1766023873450\",\n" +
-                "      \"source\": \"inputInfo-1766023848740\",\n" +
-                "      \"target\": \"review-1766023825604\",\n" +
-                "      \"sourceHandle\": \"top-source\",\n" +
-                "      \"targetHandle\": \"bottom-target\",\n" +
-                "      \"type\": \"straight\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"id\": \"edge-confirm-1766023875733-top-source-inputInfo-1766023848740-bottom-target-1766023878698\",\n" +
-                "      \"source\": \"confirm-1766023875733\",\n" +
-                "      \"target\": \"inputInfo-1766023848740\",\n" +
-                "      \"sourceHandle\": \"top-source\",\n" +
-                "      \"targetHandle\": \"bottom-target\",\n" +
-                "      \"type\": \"straight\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"id\": \"edge-releaseIsolation-1766023893308-left-source-isolation-1766023839756-right-target-1766023897229\",\n" +
-                "      \"source\": \"releaseIsolation-1766023893308\",\n" +
-                "      \"target\": \"isolation-1766023839756\",\n" +
+                "      \"id\": \"edge-isolation-1766650858056-left-source-inputInfo-1766650850963-right-target-1766650861303\",\n" +
+                "      \"source\": \"isolation-1766650858056\",\n" +
+                "      \"target\": \"inputInfo-1766650850963\",\n" +
                 "      \"sourceHandle\": \"left-source\",\n" +
                 "      \"targetHandle\": \"right-target\",\n" +
                 "      \"type\": \"straight\"\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"id\": \"edge-releaseIsolation-1766023890300-left-source-isolation-1766023834331-right-target-1766023899346\",\n" +
-                "      \"source\": \"releaseIsolation-1766023890300\",\n" +
-                "      \"target\": \"isolation-1766023834331\",\n" +
+                "      \"id\": \"edge-releaseIsolation-1766650866562-left-source-isolation-1766650858056-right-target-1766650870118\",\n" +
+                "      \"source\": \"releaseIsolation-1766650866562\",\n" +
+                "      \"target\": \"isolation-1766650858056\",\n" +
                 "      \"sourceHandle\": \"left-source\",\n" +
                 "      \"targetHandle\": \"right-target\",\n" +
                 "      \"type\": \"straight\"\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"id\": \"edge-releaseIsolation-1766023887325-left-source-isolation-1766023837357-right-target-1766023901162\",\n" +
-                "      \"source\": \"releaseIsolation-1766023887325\",\n" +
-                "      \"target\": \"isolation-1766023837357\",\n" +
+                "      \"id\": \"edge-returnLock-1766650872321-left-source-releaseIsolation-1766650866562-right-target-1766650876327\",\n" +
+                "      \"source\": \"returnLock-1766650872321\",\n" +
+                "      \"target\": \"releaseIsolation-1766650866562\",\n" +
                 "      \"sourceHandle\": \"left-source\",\n" +
                 "      \"targetHandle\": \"right-target\",\n" +
                 "      \"type\": \"straight\"\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"id\": \"edge-returnLock-1766023906693-left-source-releaseIsolation-1766023887325-right-target-1766023909659\",\n" +
-                "      \"source\": \"returnLock-1766023906693\",\n" +
-                "      \"target\": \"releaseIsolation-1766023887325\",\n" +
+                "      \"id\": \"edge-complete-1766650878643-left-source-returnLock-1766650872321-right-target-1766650882072\",\n" +
+                "      \"source\": \"complete-1766650878643\",\n" +
+                "      \"target\": \"returnLock-1766650872321\",\n" +
                 "      \"sourceHandle\": \"left-source\",\n" +
                 "      \"targetHandle\": \"right-target\",\n" +
                 "      \"type\": \"straight\"\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"id\": \"edge-returnLock-1766023906693-left-source-releaseIsolation-1766023890300-right-target-1766023914698\",\n" +
-                "      \"source\": \"returnLock-1766023906693\",\n" +
-                "      \"target\": \"releaseIsolation-1766023890300\",\n" +
+                "      \"id\": \"edge-confirm-1766650799337-left-source-createJob-1766650792290-right-target-1766657015939\",\n" +
+                "      \"source\": \"confirm-1766650799337\",\n" +
+                "      \"target\": \"createJob-1766650792290\",\n" +
                 "      \"sourceHandle\": \"left-source\",\n" +
                 "      \"targetHandle\": \"right-target\",\n" +
                 "      \"type\": \"straight\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"id\": \"edge-returnLock-1766023906693-left-source-releaseIsolation-1766023893308-right-target-1766023917338\",\n" +
-                "      \"source\": \"returnLock-1766023906693\",\n" +
-                "      \"target\": \"releaseIsolation-1766023893308\",\n" +
-                "      \"sourceHandle\": \"left-source\",\n" +
-                "      \"targetHandle\": \"right-target\",\n" +
-                "      \"type\": \"straight\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"id\": \"edge-complete-1766023921996-left-source-returnLock-1766023906693-right-target-1766023926699\",\n" +
-                "      \"source\": \"complete-1766023921996\",\n" +
-                "      \"target\": \"returnLock-1766023906693\",\n" +
-                "      \"sourceHandle\": \"left-source\",\n" +
-                "      \"targetHandle\": \"right-target\",\n" +
-                "      \"type\": \"straight\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"id\": \"edge-complete-1766023921996-bottom-source-confirm-1766023875733-right-target-1766023930202\",\n" +
-                "      \"source\": \"complete-1766023921996\",\n" +
-                "      \"target\": \"confirm-1766023875733\",\n" +
-                "      \"sourceHandle\": \"bottom-source\",\n" +
-                "      \"targetHandle\": \"right-target\",\n" +
-                "      \"type\": \"straight\"\n" +
                 "    }\n" +
                 "  ]\n" +
                 "}";

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkService.java

@@ -114,4 +114,15 @@ public interface WorkflowWorkService extends IService<WorkflowWorkDO> {
      */
     AppHomeVO getAppHomeStatistics();
 
+
+    //---------------------------------------------admin-----------------------------------------
+
+    /**
+     * 我的作业分页
+     * @param vo
+     * @return
+     */
+    PageResult<MyWorkRespVO> getAdminWorkPage(MyWorkReqVO vo);
+
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkServiceImpl.java

@@ -124,6 +124,12 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
     @Override
     public void deleteWorkflowWorkListByIds(List<Long> ids) {
         Assert.isFalse(ids.isEmpty(), "请选择需要删除的数据!");
+        // 执行中和完成的作业不能删
+        /*List<WorkflowWorkDO> list = list(Wrappers.<WorkflowWorkDO>lambdaQuery()
+                .in(WorkflowWorkDO::getId, ids)
+                .ne(WorkflowWorkDO::getStatus, "unreleased")
+                .ne(WorkflowWorkDO::getStatus, "scheduled"));
+        Assert.isTrue(list.isEmpty(), "仅未发布的作业可以删除!");*/
         // 删除
         workflowWorkMapper.deleteByIds(ids);
         // 同时删除解析的作业节点
@@ -340,4 +346,17 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
     }
 
 
+    // ---------------------------------------------admin--------------------------------------------------------
+    @Override
+    public PageResult<MyWorkRespVO> getAdminWorkPage(MyWorkReqVO vo) {
+        Page page = new Page<>().setSize(vo.getPageSize()).setCurrent(vo.getPageNo());
+        // 获取和我相关的作业
+        Page<MyWorkRespVO> myWorkPage = workflowWorkMapper.getAdminWorkPage(page, vo);
+        PageResult<MyWorkRespVO> respVOPageResult = new PageResult<>();
+        respVOPageResult.setList(myWorkPage.getRecords());
+        respVOPageResult.setTotal(myWorkPage.getTotal());
+        return respVOPageResult;
+    }
+
+
 }

yudao-module-iscs/src/main/resources/mapper/workdesign/WorkflowWorkMapper.xml

@@ -149,4 +149,40 @@
         </where>
 
     </select>
+    <select id="getAdminWorkPage"
+            resultType="cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.MyWorkRespVO">
+        SELECT
+        work_node.work_id,
+        ww.name,
+        ww.order_no,
+        ww.urgency_level,
+        ww.completion_time,
+        ww.cancellation_time,
+        ww.cancellation_reason,
+        ww.initiator_name,
+        su.nickname as worker_user_name,
+        work_node.id as node_id,
+        work_node.start_time as work_time,
+        work_node.id as current_node_id,
+        work_node.node_name as current_node_name,
+        work_node.approval_status
+        FROM
+        isc_workflow_work_node work_node
+        left join isc_workflow_work ww on ww.id = work_node.work_id
+        left join system_users su on su.id = work_node.worker_user_id
+        <where>
+            work_node.deleted = b'0'
+            AND ww.status != 'unreleased'
+            AND ww.status != 'scheduled'
+            <if test="vo.key != null and vo.key.trim != ''">
+                AND (ww.name like concat('%',#{vo.key},'%')
+                OR ww.order_no like concat('%',#{vo.key},'%')
+                OR ww.initiator_name like concat('%',#{vo.key},'%'))
+            </if>
+            <if test="vo.approvalStatus != null and vo.approvalStatus.trim != ''">
+                AND work_node.approval_status = #{vo.approvalStatus}
+            </if>
+        </where>
+        ORDER BY work_node.update_time DESC
+    </select>
 </mapper>