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/ServiceTaskoperMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
index eff4e36..0fd21c8 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
@@ -21,6 +21,10 @@
<result property="guid" column="guid"/>
<result property="pguid" column="pguid"/>
<result property="pid" column="pid"/>
+ <result property="deptCode" column="dept_code"/>
+ <result property="deptName" column="dept_name"/>
+ <result property="wardCode" column="ward_code"/>
+ <result property="wardName" column="ward_name"/>
</resultMap>
<sql id="selectServiceTaskoperVo">
@@ -39,7 +43,11 @@
orgid,
guid,
pguid,
- pid
+ pid,
+ dept_code,
+ dept_name,
+ ward_code,
+ ward_name
from service_taskoper
</sql>
@@ -84,6 +92,18 @@
<if test="pid != null ">
and pid = #{pid}
</if>
+ <if test="deptCode != null and deptCode != ''">
+ and dept_code = #{deptCode}
+ </if>
+ <if test="deptName != null and deptName != ''">
+ and dept_name = #{deptName}
+ </if>
+ <if test="wardCode != null and wardCode != ''">
+ and ward_code = #{wardCode}
+ </if>
+ <if test="wardName != null and wardName != ''">
+ and ward_name = #{wardName}
+ </if>
</select>
<select id="selectServiceTaskoperById" parameterType="Long"
@@ -126,6 +146,14 @@
</if>
<if test="pid != null">pid,
</if>
+ <if test="deptCode != null">dept_code,
+ </if>
+ <if test="deptName != null">dept_name,
+ </if>
+ <if test="wardCode != null">ward_code,
+ </if>
+ <if test="wardName != null">ward_name,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskId != null">#{taskId},
@@ -157,6 +185,14 @@
<if test="pguid != null">#{pguid},
</if>
<if test="pid != null">#{pid},
+ </if>
+ <if test="deptCode != null">#{deptCode},
+ </if>
+ <if test="deptName != null">#{deptName},
+ </if>
+ <if test="wardCode != null">#{wardCode},
+ </if>
+ <if test="wardName != null">#{wardName},
</if>
</trim>
</insert>
@@ -209,6 +245,18 @@
<if test="pid != null">pid =
#{pid},
</if>
+ <if test="deptCode != null">dept_code =
+ #{deptCode},
+ </if>
+ <if test="deptName != null">dept_name =
+ #{deptName},
+ </if>
+ <if test="wardCode != null">ward_code =
+ #{wardCode},
+ </if>
+ <if test="wardName != null">ward_name =
+ #{wardName},
+ </if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3