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/SvyCategoryMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
index 4b1a2da..54cbaa0 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
@@ -37,12 +37,11 @@
<select id="selectSvyCategoryList" parameterType="com.smartor.domain.SvyCategory" resultMap="SvyCategoryResult">
<include refid="selectSvyCategoryVo"/>
- <where>
+ where 1=1
<if test="categoryname != null and categoryname != ''">and categoryname like concat('%', #{categoryname},
'%')
</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
- </where>
</select>
<select id="selectSvyCategoryById" parameterType="String" resultType="com.smartor.domain.SvyCategory">
@@ -58,12 +57,14 @@
a.upload_time,
count(b.svyid) svyNum
from svy_category a,svy_lib_title b
- <where>
- a.id = b.categoryid
+ where 1=1
+ and a.id = b.categoryid
+ <if test="orgid != null and orgid != ''">
+ and a.orgid = #{orgid}
+ </if>
<if test="categoryname != null and categoryname != ''">
and categoryname = #{categoryname}
</if>
- </where>
group by a.categoryname
</select>
--
Gitblit v1.9.3