From cbe903c4c4493715ad8d307107fb95975acfc975 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 四月 2026 16:14:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml | 81 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
index 46702b3..66359ab 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
@@ -45,6 +45,7 @@
<result property="prompt" column="prompt"/>
<result property="sendTaskid" column="send_taskid"/>
<result property="sendTaskname" column="send_taskname"/>
+ <result property="defaultValue" column="default_value"/>
</resultMap>
<sql id="selectSvyTaskTemplateTargetoptionVo">
@@ -64,6 +65,7 @@
categoryName,
targetvalue,
targetregex2,
+ default_value,
targetregex,
optioncontent, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, scriptid, nodynamiccruxs, dynamiccruxs, next_question, picture_path
from svy_task_template_targetoption
@@ -72,44 +74,44 @@
<select id="selectSvyTaskTemplateTargetoptionList" parameterType="com.smartor.domain.SvyTaskTemplateTargetoption"
resultMap="SvyTaskTemplateTargetoptionResult">
<include refid="selectSvyTaskTemplateTargetoptionVo"/>
- <where>
- del_flag=0
- <if test="taskid != null ">and taskid = #{taskid}</if>
- <if test="score != null ">and score = #{score}</if>
- <if test="prompt != null ">and prompt = #{prompt}</if>
- <if test="templateID != null ">and templateID = #{templateID}</if>
- <if test="targetid != null ">and targetid = #{targetid}</if>
- <if test="targetname != null and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
- <if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- '%')
- </if>
- <if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
- <if test="targetregex2 != null and targetregex2 != ''">and targetregex2 = #{targetregex2}</if>
- <if test="targetregex != null and targetregex != ''">and targetregex = #{targetregex}</if>
- <if test="optioncontent != null and optioncontent != ''">and optioncontent = #{optioncontent}</if>
- <if test="language != null and language != ''">and language = #{language}</if>
- <if test="version != null and version != ''">and version = #{version}</if>
- <if test="groupid != null and groupid != ''">and groupid = #{groupid}</if>
- <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
- <if test="warnup != null ">and warnup = #{warnup}</if>
- <if test="warndown != null ">and warndown = #{warndown}</if>
- <if test="isupload != null ">and isupload = #{isupload}</if>
- <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
- <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
- <if test="pid != null ">and pid = #{pid}</if>
- <if test="guid != null and guid != ''">and guid = #{guid}</if>
- <if test="scriptid != null ">and scriptid = #{scriptid}</if>
-<!-- <if test="nodynamiccruxs != null ">and nodynamiccruxs = #{nodynamiccruxsJson}</if>-->
-<!-- <if test="dynamiccruxs != null ">and dynamiccruxs = #{dynamiccruxsJson}</if>-->
- <if test="nextQuestion != null ">and next_question = #{nextQuestion}</if>
- <if test="picturePath != null and picturePath != ''">and picture_path = #{picturePath}</if>
- <if test="optionCode != null">and option_code = #{optionCode}</if>
- <if test="appendflag != null">and appendflag = #{appendflag}</if>
- <if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
- <if test="sendTaskid != null">and send_taskid= #{sendTaskid}</if>
- <if test="sendTaskname != null">and send_taskname = #{sendTaskname}</if>
- </where>
+ where 1=1
+ and del_flag = 0
+ <if test="taskid != null ">and taskid = #{taskid}</if>
+ <if test="score != null ">and score = #{score}</if>
+ <if test="prompt != null ">and prompt = #{prompt}</if>
+ <if test="templateID != null ">and templateID = #{templateID}</if>
+ <if test="targetid != null ">and targetid = #{targetid}</if>
+ <if test="targetname != null and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
+ <if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
+ <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
+ '%')
+ </if>
+ <if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
+ <if test="defaultValue != null">and default_value = #{defaultValue}</if>
+ <if test="targetregex2 != null and targetregex2 != ''">and targetregex2 = #{targetregex2}</if>
+ <if test="targetregex != null and targetregex != ''">and targetregex = #{targetregex}</if>
+ <if test="optioncontent != null and optioncontent != ''">and optioncontent = #{optioncontent}</if>
+ <if test="language != null and language != ''">and language = #{language}</if>
+ <if test="version != null and version != ''">and version = #{version}</if>
+ <if test="groupid != null and groupid != ''">and groupid = #{groupid}</if>
+ <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
+ <if test="warnup != null ">and warnup = #{warnup}</if>
+ <if test="warndown != null ">and warndown = #{warndown}</if>
+ <if test="isupload != null ">and isupload = #{isupload}</if>
+ <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+ <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="pid != null ">and pid = #{pid}</if>
+ <if test="guid != null and guid != ''">and guid = #{guid}</if>
+ <if test="scriptid != null ">and scriptid = #{scriptid}</if>
+ <!-- <if test="nodynamiccruxs != null ">and nodynamiccruxs = #{nodynamiccruxsJson}</if>-->
+ <!-- <if test="dynamiccruxs != null ">and dynamiccruxs = #{dynamiccruxsJson}</if>-->
+ <if test="nextQuestion != null ">and next_question = #{nextQuestion}</if>
+ <if test="picturePath != null and picturePath != ''">and picture_path = #{picturePath}</if>
+ <if test="optionCode != null">and option_code = #{optionCode}</if>
+ <if test="appendflag != null">and appendflag = #{appendflag}</if>
+ <if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
+ <if test="sendTaskid != null">and send_taskid= #{sendTaskid}</if>
+ <if test="sendTaskname != null">and send_taskname = #{sendTaskname}</if>
</select>
<select id="selectSvyTaskTemplateTargetoptionById" parameterType="Long"
@@ -160,6 +162,7 @@
<if test="prompt != null">prompt,</if>
<if test="sendTaskid != null">send_taskid,</if>
<if test="sendTaskname != null">send_taskname,</if>
+ <if test="defaultValue != null">default_value,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskid != null">#{taskid},</if>
@@ -200,6 +203,7 @@
<if test="prompt != null">#{prompt},</if>
<if test="sendTaskid != null">#{sendTaskid},</if>
<if test="sendTaskname != null">#{sendTaskname}</if>
+ <if test="defaultValue != null">#{defaultValue}</if>
</trim>
</insert>
@@ -244,6 +248,7 @@
<if test="prompt != null">score = #{prompt},</if>
<if test="sendTaskid != null">send_taskid= #{sendTaskid},</if>
<if test="sendTaskname != null">send_taskname = #{sendTaskname},</if>
+ <if test="defaultValue != null">default_value = #{defaultValue},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3