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/SysDeptMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
index d17ca0c..a0327a6 100644
--- a/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
@@ -84,6 +84,9 @@
<if test="hisParentId != null and hisParentId != ''">
AND his_parent_id = #{hisParentId}
</if>
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
<if test="campusid != null and campusid != ''">
AND campusid = #{campusid}
</if>
@@ -149,6 +152,52 @@
<if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
+ order by d.dept_id
+ limit 1
+ </select>
+
+ <select id="selectDeptByCodeAndType" resultMap="SysDeptResult">
+ <include refid="selectDeptVo"/>
+ where d.del_flag = '0'
+ and d.dept_code = #{deptCode}
+ <if test="orgid != null and orgid != ''">
+ AND d.orgid = #{orgid}
+ </if>
+ <if test="deptType != null and deptType != ''">
+ AND d.dept_type = #{deptType}
+ </if>
+ order by d.dept_id
+ limit 1
+ </select>
+
+ <select id="selectDeptByCodeAndCampus" parameterType="string" resultMap="SysDeptResult">
+ select d.dept_id,
+ d.parent_id,
+ d.type,
+ d.campusid,
+ d.dept_code,
+ d.dept_type,
+ d.ancestors,
+ d.dept_name,
+ d.order_num,
+ d.leader,
+ d.phone,
+ d.email,
+ d.orgid,
+ d.his_dept_id,
+ d.his_parent_id,
+ d.status
+ from sys_dept d
+ where del_flag = 0
+ <if test="deptCode != null and deptCode != ''">
+ AND dept_code = #{deptCode}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
+ <if test="campusid != null and campusid != ''">
+ AND campusid = #{campusid}
+ </if>
</select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int">
--
Gitblit v1.9.3