From 1b0b16862c1941c5a4e6e8c538e1a27c55d4ab81 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 04 二月 2026 13:04:06 +0800
Subject: [PATCH] #路径流程页

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
index 84ddd58..624cc6d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
@@ -60,21 +60,31 @@
     @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:save')")
     @OperationLog("Create 鐗╂枡鏉冮檺")
     @PostMapping("/taskPathTemplateMerge/save")
-    public R save(@RequestBody TaskPathTemplateMerge taskPathTemplateMerge) {
-        taskPathTemplateMerge.setCreateBy(getLoginUserId());
-        taskPathTemplateMerge.setCreateTime(new Date());
-        taskPathTemplateMerge.setUpdateBy(getLoginUserId());
-        taskPathTemplateMerge.setUpdateTime(new Date());
-        if (Cools.isEmpty(taskPathTemplateMerge.getSourceType(),taskPathTemplateMerge.getTargetType())) {
-            return R.error();
+    public R save(@RequestBody TaskPathTemplateMerge taskPathTemplateMerges) {
+        List<String> sourceTypeR = taskPathTemplateMerges.getSourceTypeR();
+        List<String> targetTypeR = taskPathTemplateMerges.getTargetTypeR();
+        for (String sourceType : sourceTypeR) {
+            for (String targetType : targetTypeR) {
+                TaskPathTemplateMerge taskPathTemplateMerge = new TaskPathTemplateMerge();
+                taskPathTemplateMerge.setConditionExpression(taskPathTemplateMerges.getConditionExpression());
+                taskPathTemplateMerge.setSourceType(sourceType);
+                taskPathTemplateMerge.setTargetType(targetType);
+                taskPathTemplateMerge.setCreateBy(getLoginUserId());
+                taskPathTemplateMerge.setCreateTime(new Date());
+                taskPathTemplateMerge.setUpdateBy(getLoginUserId());
+                taskPathTemplateMerge.setUpdateTime(new Date());
+                if (Cools.isEmpty(taskPathTemplateMerge.getSourceType(),taskPathTemplateMerge.getTargetType())) {
+                    return R.error();
+                }
+                String name = taskPathTemplateMerge.getSourceType()+"==>"+taskPathTemplateMerge.getTargetType();
+                taskPathTemplateMerge.setTemplateName(name);
+                taskPathTemplateMerge.setTemplateCode(name);
+                if (!taskPathTemplateMergeService.save(taskPathTemplateMerge)) {
+                    return R.error("Save Fail");
+                }
+            }
         }
-        String name = taskPathTemplateMerge.getSourceType()+"==>"+taskPathTemplateMerge.getTargetType();
-        taskPathTemplateMerge.setTemplateName(name);
-        taskPathTemplateMerge.setTemplateCode(name);
-        if (!taskPathTemplateMergeService.save(taskPathTemplateMerge)) {
-            return R.error("Save Fail");
-        }
-        return R.ok("Save Success").add(taskPathTemplateMerge);
+        return R.ok("Save Success").add(taskPathTemplateMerges);
     }
 
     @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:update')")

--
Gitblit v1.9.1