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/HeLibraryAssortMapper.xml | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
index ad40e83..0cac58b 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
@@ -42,18 +42,17 @@
<select id="selectHeLibraryAssortList" parameterType="com.smartor.domain.HeLibraryAssort"
resultMap="HeLibraryAssortResult">
<include refid="selectHeLibraryAssortVo"/>
- where 1=1
- and del_flag != 1
- <if test="assortname != null and assortname != ''">and assortname like concat('%', #{assortname}, '%')</if>
- <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
- <if test="isupload != null ">and isupload = #{isupload}</if>
- <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
- <if test="pid != null ">and pid = #{pid}</if>
- <if test="guid != null and guid != ''">and guid = #{guid}</if>
- <if test="seqno != null ">and seqno = #{seqno}</if>
- <if test="hetype != null ">and hetype = #{hetype}</if>
-
+ where del_flag != 1
+ <if test="assortname != null and assortname != ''">and assortname like concat('%', #{assortname}, '%')</if>
+ <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="isupload != null ">and isupload = #{isupload}</if>
+ <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+ <if test="pid != null ">and pid = #{pid}</if>
+ <if test="guid != null and guid != ''">and guid = #{guid}</if>
+ <if test="seqno != null ">and seqno = #{seqno}</if>
+ <if test="hetype != null ">and hetype = #{hetype}</if>
order by seqno asc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="selectSeqMax" resultType="integer">
@@ -124,7 +123,7 @@
<update id="deleteHeLibraryAssortById" parameterType="Long">
update he_library_assort
<trim prefix="SET" suffixOverrides=",">
- del_flag = 1
+ del_flag = 1
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3