From 87b79ea739ec32bd7d0e493a6ea8525212f6c763 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 10 十月 2026 15:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261008
---
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml
index caef2dd..f4d70dc 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml
@@ -42,12 +42,13 @@
<result property="sendTaskid" column="send_taskid"/>
<result property="sendTaskname" column="send_taskname"/>
<result property="isException" column="is_exception"/>
+ <result property="defaultValue" column="default_value"/>
</resultMap>
<sql id="selectIvrLibaTemplateTargetoptionVo">
select id,
targetid,
- is_exception,
+ default_value,
send_taskid,
send_taskname,
is_end,
@@ -77,7 +78,7 @@
where 1=1
and del_flag = 0
<if test="targetid != null ">and targetid = #{targetid}</if>
- <if test="isException != null ">and is_exception = #{isException}</if>
+ <if test="defaultValue != null ">and default_value = #{defaultValue}</if>
<if test="isEnd != null ">and is_end = #{isEnd}</if>
<if test="score != null ">and score = #{score}</if>
<if test="targetname != null ">and targetname = #{targetname}</if>
@@ -113,6 +114,23 @@
resultMap="IvrLibaTemplateTargetoptionResult">
<include refid="selectIvrLibaTemplateTargetoptionVo"/>
where id = #{id}
+ </select>
+
+ <!--
+ 婊℃剰搴︾粺璁★細涓�娆″彇鍥炲涓棶棰樼殑閫夐」鍒嗗�硷紙鍙彇 scriptid銆乻core锛夈��
+ 绛変环浜庨�愪釜闂鎵ц selectIvrLibaTemplateTargetoptionList(scriptid)锛屼絾鍙彇鐢ㄥ緱鍒扮殑鍒楋紱
+ scriptIds 涓虹┖鏃朵笉鍔� scriptid 杩囨护锛堝搴斿師鏌ヨ scriptid 涓� null 鏃朵涪寮冭鏉′欢鐨勮涓猴級銆�
+ -->
+ <select id="selectIvrLibaTargetoptionScores" resultType="java.util.Map">
+ select scriptid as scriptid, score as score
+ from ivr_liba_template_targetoption
+ where del_flag = 0
+ <if test="scriptIds != null and scriptIds.size() > 0">
+ and scriptid IN
+ <foreach collection="scriptIds" item="scriptId" open="(" separator="," close=")">
+ #{scriptId}
+ </foreach>
+ </if>
</select>
<insert id="insertIvrLibaTemplateTargetoption" parameterType="com.smartor.domain.IvrLibaTemplateTargetoption"
@@ -154,6 +172,7 @@
<if test="sendTaskid != null">send_taskid,</if>
<if test="sendTaskname != null">send_taskname,</if>
<if test="isException != null">is_exception,</if>
+ <if test="defaultValue != null">default_value,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="targetid != null">#{targetid},</if>
@@ -191,6 +210,7 @@
<if test="sendTaskid != null">#{sendTaskid},</if>
<if test="sendTaskname != null">#{sendTaskname},</if>
<if test="isException != null">#{isException},</if>
+ <if test="defaultValue != null">#{defaultValue},</if>
</trim>
</insert>
@@ -232,6 +252,7 @@
<if test="sendTaskid != null">send_taskid= #{sendTaskid},</if>
<if test="sendTaskname != null">send_taskname = #{sendTaskname},</if>
<if test="isException != null">is_exception = #{isException},</if>
+ <if test="defaultValue != null">default_value = #{defaultValue},</if>
</trim>
where id = #{id}
</update>
@@ -242,6 +263,7 @@
<if test="nodynamiccruxsJson == null ">nodynamiccruxs = #{nodynamiccruxsJson},</if>
<if test="dynamiccruxsJson == null ">dynamiccruxs = #{dynamiccruxsJson},</if>
+ <if test="defaultValue == null ">default_value = #{defaultValue},</if>
</trim>
where id = #{id}
--
Gitblit v1.9.3