From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候,对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访,这个是给市一使用的                                                                                                                                                                                            再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访,这个是给市一使用的                                                                                                                                                                                            首次待随访待发送(visitCount = 1 && sendstate in (1、2))                                                                                                                                                                                            再次待随访待发送(visitCount > 1 && sendstate in (1、2))                                                                                                                                                                                            首次待随访已发送(visitCount = 1 && sendstate = in (3、7))                                                                                                                                                                                            再次待随访已发送(visitCount > 1 && sendstate = in (3、7))                                                                                                                                                                                            首次已发送(visitCount = 1 && sendstate = 3)                                                                                                                                                                                            再次已发送(visitCount > 1 && sendstate = 3)

---
 smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
index db40df2..be111cc 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
@@ -6,6 +6,8 @@
 
     <resultMap type="com.smartor.domain.IvrLibaScript" id="IvrLibaScriptResult">
         <result property="id" column="id"/>
+        <result property="assortid" column="assortid"/>
+        <result property="dimension" column="dimension"/>
         <result property="scriptTopic" column="script_topic"/>
         <result property="scriptContent" column="script_content"/>
         <result property="ivrVoice" column="ivr_voice"/>
@@ -57,6 +59,8 @@
     <sql id="selectIvrLibaScriptVo">
         select id,
                suitway,
+               dimension,
+               assortid,
                targetdesc,
                campus,
                deptNames,
@@ -88,10 +92,11 @@
     <select id="selectIvrLibaScriptList" parameterType="com.smartor.domain.IvrLibaScript"
             resultMap="IvrLibaScriptResult">
         <include refid="selectIvrLibaScriptVo"/>
-        <where>
-            del_flag=0
+        where 1=1
+            and del_flag = 0
             <if test="id != null ">and id = #{id}</if>
             <if test="deptIds != null  and deptIds != ''">and deptIds = #{deptIds}</if>
+            <if test="dimension != null  and dimension != ''">and dimension = #{dimension}</if>
             <if test="deptNames != null  and deptNames != ''">and deptNames like concat('%', #{deptNames}, '%')</if>
             <if test="scriptTopic != null  and scriptTopic != ''">and script_topic like concat('%', #{scriptTopic},
                 '%')
@@ -131,7 +136,6 @@
             <if test="pid != null ">and pid = #{pid}</if>
             <if test="guid != null  and guid != ''">and guid = #{guid}</if>
             <if test="otherdata != null  and otherdata != ''">and otherdata = #{otherdata}</if>
-        </where>
     </select>
 
     <select id="selectIvrLibaScriptByQuestionid" parameterType="String" resultMap="IvrLibaScriptResult">
@@ -190,6 +194,7 @@
             <if test="valueType != null">value_type,</if>
             <if test="reply != null">reply,</if>
             <if test="targetdesc != null">targetdesc,</if>
+            <if test="dimension != null">dimension,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="scriptTopic != null">#{scriptTopic},</if>
@@ -239,6 +244,7 @@
             <if test="valueType != null">#{valueType},</if>
             <if test="reply != null">#{reply},</if>
             <if test="targetdesc != null">#{targetdesc},</if>
+            <if test="dimension != null">#{dimension},</if>
         </trim>
     </insert>
 
@@ -293,6 +299,7 @@
             <if test="valueType != null">value_type = #{valueType},</if>
             <if test="reply != null">reply = #{reply},</if>
             <if test="targetdesc != null">targetdesc = #{targetdesc},</if>
+            <if test="dimension != null">dimension = #{dimension},</if>
         </trim>
         where id = #{id}
     </update>

--
Gitblit v1.9.3