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/ServiceTaskdeptMapper.xml | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
index eac2ee3..ef5435e 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
@@ -40,8 +40,8 @@
<select id="selectServiceTaskdeptList" parameterType="com.smartor.domain.ServiceTaskdept"
resultMap="ServiceTaskdeptResult">
<include refid="selectServiceTaskdeptVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
<if test="taskId != null ">
and task_id = #{taskId}
</if>
@@ -69,7 +69,6 @@
<if test="orgid != null and orgid != ''">
and orgid = #{orgid}
</if>
- </where>
</select>
<select id="selectServiceTaskdeptById" parameterType="Long"
@@ -172,7 +171,12 @@
<if test="orgid != null">orgid = #{orgid},
</if>
</trim>
- where id = #{id}
+ where 1=1
+ <if test="id != null">and id = #{id}</if>
+ <if test="taskId != null">and task_id = #{taskId}</if>
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
</update>
<update id="deleteServiceTaskdeptById" parameterType="Long">
@@ -183,6 +187,22 @@
</trim>
where id = #{id}
</update>
+ <update id="deleteServiceTaskdeptByTaskId" parameterType="com.smartor.domain.ServiceTaskdept">
+ update service_taskdept
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag =1,
+ update_time = sysdate()
+ </trim>
+ where 1=1
+ <if test="id != null">and id = #{id}</if>
+ <if test="taskId != null">and task_id = #{taskId}</if>
+ <if test="deptType != null and deptType != ''">
+ AND dept_type = #{deptType}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
+ </update>
<update id="deleteServiceTaskdeptByIds" parameterType="String">
update service_taskdept
--
Gitblit v1.9.3