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/SchemeTriggerruleMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml
index c55a7c3..b2b30bd 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml
@@ -63,7 +63,7 @@
 
     <select id="selectSchemeTriggerruleList" parameterType="SchemeTriggerrule" resultMap="SchemeTriggerruleResult">
         <include refid="selectSchemeTriggerruleVo"/>
-        <where>
+        where 1=1
             <if test="conditionstype != null ">and conditionstype = #{conditionstype}</if>
             <if test="orand != null ">and orand = #{orand}</if>
             <if test="ruleconditions != null  and ruleconditions != ''">and ruleconditions = #{ruleconditions}</if>
@@ -88,7 +88,6 @@
             <if test="groupnumber != null ">and groupnumber = #{groupnumber}</if>
             <if test="grouporand != null ">and grouporand = #{grouporand}</if>
             <if test="isrequired != null ">and isrequired = #{isrequired}</if>
-        </where>
     </select>
 
     <select id="selectSchemeTriggerruleById" parameterType="Long" resultMap="SchemeTriggerruleResult">

--
Gitblit v1.9.3