From 44a18263dc01254d9698d94666ab6492dbb87ada Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 12 May 2025 17:49:48 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E5=92=8C=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1417249477328896]自动化-自定义工具和组合工具支持版本号备注 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1417249477328896
---
 .../autoexec/dao/mapper/AutoexecScriptMapper.xml      | 11 +++++++++++
 .../autoexec/dto/script/AutoexecScriptVersionVo.java  | 11 +++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecScriptMapper.xml b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecScriptMapper.xml
index af216db9..74d4d38f 100644
--- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecScriptMapper.xml
+++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecScriptMapper.xml
@@ -207,6 +207,7 @@
             resultType="neatlogic.framework.autoexec.dto.script.AutoexecScriptVersionVo">
         select `id`,
                `script_id` as scriptId,
+               `title`,
                `version`,
                `encoding`,
                `parser`,
@@ -251,6 +252,7 @@
         select
         `id`,
         `version`,
+        `title`,
         `status`,
         `reviewer`,
         `is_active` as isActive,
@@ -292,6 +294,7 @@
         select
         a.`id`,
         a.`script_id` as scriptId,
+        a.`title`,
         a.`version`,
         a.`encoding`,
         a.`parser`,
@@ -473,6 +476,7 @@
             resultType="neatlogic.framework.autoexec.dto.script.AutoexecScriptVersionVo">
         select `id`,
                `script_id` as scriptId,
+               `title`,
                `version`,
                `encoding`,
                `parser`,
@@ -491,6 +495,7 @@
             resultType="neatlogic.framework.autoexec.dto.script.AutoexecScriptVersionVo">
         select `id`,
                `script_id` as scriptId,
+               `title`,
                `version`,
                `encoding`,
                `parser`,
@@ -526,6 +531,7 @@
     <select id="getActiveVersionWithUseLibsByScriptId" resultMap="scriptVersionUseLibMap">
         select asv.`id`,
                asv.`script_id` as scriptId,
+               asv.`title`,
                asv.`version`,
                asv.`encoding`,
                asv.`parser`,
@@ -546,6 +552,7 @@
             resultType="neatlogic.framework.autoexec.dto.script.AutoexecScriptVersionVo">
         select `id`,
                `script_id` as scriptId,
+               `title`,
                `version`,
                `encoding`,
                `parser`,
@@ -565,6 +572,7 @@
             resultType="neatlogic.framework.autoexec.dto.script.AutoexecScriptVersionVo">
         select `id`,
                `script_id` as scriptId,
+               `title`,
                `version`,
                `encoding`,
                `parser`,
@@ -1395,6 +1403,7 @@
             resultType="neatlogic.framework.autoexec.dto.script.AutoexecScriptVersionVo">
         select `id`,
                `script_id` as scriptId,
+               `title`,
                `version`,
                `encoding`,
                `parser`,
@@ -1585,6 +1594,7 @@
         SELECT `id`,
                `version`,
                `script_id` as scriptId,
+               `title`,
                `parser`
         FROM `autoexec_script_version`
         where `script_id` = #{id}
@@ -1597,6 +1607,7 @@
         select
         a.`id`,
         a.`script_id` as scriptId,
+        a.`title`,
         a.`parser`,
         a.`package_file_id` as packageFileId,
         c.`id` AS lineId,
diff --git a/src/main/java/neatlogic/framework/autoexec/dto/script/AutoexecScriptVersionVo.java b/src/main/java/neatlogic/framework/autoexec/dto/script/AutoexecScriptVersionVo.java
index c46f3b2f..68eaaebf 100644
--- a/src/main/java/neatlogic/framework/autoexec/dto/script/AutoexecScriptVersionVo.java
+++ b/src/main/java/neatlogic/framework/autoexec/dto/script/AutoexecScriptVersionVo.java
@@ -28,7 +28,6 @@ import neatlogic.framework.file.dto.FileVo;
 import neatlogic.framework.restful.annotation.EntityField;
 import neatlogic.framework.util.SnowflakeUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -130,11 +129,11 @@ public class AutoexecScriptVersionVo extends BaseEditorVo implements Serializabl
     }
 
     public String getTitle() {
-        if (StringUtils.isNotBlank(status)) {
-            if (Objects.equals(status, ScriptVersionStatus.PASSED.getValue())) {
-                title = "版本" + version;
-            }
-        }
+//        if (StringUtils.isNotBlank(status)) {
+//            if (Objects.equals(status, ScriptVersionStatus.PASSED.getValue())) {
+//                title = "版本" + version;
+//            }
+//        }
         return title;
     }
 
-- 
Gitee