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/ServiceOutPathMapper.xml | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
index fd1a9fb..afedfde 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
@@ -22,6 +22,9 @@
<result property="wardName" column="ward_name"/>
<result property="deptCode" column="dept_code"/>
<result property="deptName" column="dept_name"/>
+ <result property="taskId" column="task_id"/>
+ <result property="subId" column="sub_id"/>
+
</resultMap>
<sql id="selectServiceOutPathVo">
@@ -31,6 +34,8 @@
param3,
param5,
param6,
+ task_id,
+ sub_id,
create_time,
update_time,
radix,
@@ -87,6 +92,12 @@
<if test="deptName != null and deptName != ''">
and dept_name=#{deptName}
</if>
+ <if test="subId != null">
+ and sub_id=#{subId}
+ </if>
+ <if test="taskId != null">
+ and task_id=#{taskId}
+ </if>
</select>
<select id="selectServiceOutPathById" parameterType="Long"
@@ -125,7 +136,12 @@
</if>
<if test="deptName != null">dept_name,
</if>
-
+ <if test="subId != null">
+ sub_id,
+ </if>
+ <if test="taskId != null ">
+ task_id,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="param1 != null">#{param1},
@@ -153,6 +169,12 @@
<if test="deptCode != null">#{deptCode},
</if>
<if test="deptName != null">#{deptName},
+ </if>
+ <if test="subId != null ">
+ #{subId},
+ </if>
+ <if test="taskId != null ">
+ #{taskId},
</if>
</trim>
</insert>
@@ -202,6 +224,12 @@
<if test="deptName != null">dept_name =
#{deptName},
</if>
+ <if test="subId != null">
+ sub_id=#{subId},
+ </if>
+ <if test="taskId != null">
+ task_id=#{taskId},
+ </if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3