From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
index 5a5fe37..57dba35 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
@@ -7,6 +7,7 @@
<resultMap type="com.smartor.domain.SvyTaskTemplateScript" id="SvyTaskTemplateScriptResult">
<result property="id" column="id"/>
<result property="taskid" column="taskid"/>
+ <result property="ishide" column="ishide"/>
<result property="scriptno" column="scriptno"/>
<result property="templateID" column="templateID"/>
<result property="scriptid" column="scriptid"/>
@@ -43,13 +44,16 @@
<result property="score" column="score"/>
<result property="prompt" column="prompt"/>
<result property="groupName" column="group_name"/>
+ <result property="categoryid" column="categoryid"/>
</resultMap>
<sql id="selectSvyTaskTemplateScriptVo">
select id,
sort,
+ ishide,
prompt,
+ categoryid,
group_name,
branch_flag,
branch_nextscriptno,
@@ -68,8 +72,10 @@
<select id="selectSvyTaskTemplateScriptList" parameterType="com.smartor.domain.SvyTaskTemplateScript"
resultMap="SvyTaskTemplateScriptResult">
<include refid="selectSvyTaskTemplateScriptVo"/>
- <where>
+ where 1=1
<if test="taskid != null ">and taskid = #{taskid}</if>
+ <if test="categoryid != null ">and categoryid = #{categoryid}</if>
+ <if test="ishide != null ">and ishide = #{ishide}</if>
<if test="scriptno != null ">and scriptno = #{scriptno}</if>
<if test="templateID != null ">and templateID = #{templateID}</if>
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
@@ -104,7 +110,6 @@
<if test="branchNextscriptno != null and branchNextscriptno != ''">and branch_nextscriptno =
#{branchNextscriptno}
</if>
- </where>
</select>
<select id="selectSvyTaskTemplateScriptByID" parameterType="Long" resultMap="SvyTaskTemplateScriptResult">
@@ -153,6 +158,8 @@
<if test="score != null ">score,</if>
<if test="prompt != null ">prompt,</if>
<if test="groupName != null ">group_name,</if>
+ <if test="ishide != null ">ishide,</if>
+ <if test="categoryid != null ">categoryid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskid != null">#{taskid},</if>
@@ -192,6 +199,8 @@
<if test="score != null ">#{score},</if>
<if test="prompt != null ">#{prompt},</if>
<if test="groupName != null ">#{groupName},</if>
+ <if test="ishide != null ">#{ishide},</if>
+ <if test="categoryid != null ">#{categoryid},</if>
</trim>
</insert>
@@ -237,6 +246,8 @@
<if test="score != null">score = #{score},</if>
<if test="prompt != null">prompt = #{prompt},</if>
<if test="groupName != null ">group_name = #{groupName},</if>
+ <if test="ishide != null ">ishide = #{ishide},</if>
+ <if test="categoryid != null ">categoryid = #{categoryid},</if>
</trim>
where id = #{d}
</update>
--
Gitblit v1.9.3