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/SysUserDeptMapper.xml | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
index ca6fd04..80691f9 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
@@ -234,8 +234,48 @@
del_flag =1,
update_time = sysdate()
</trim>
- where user_id =#{userId} and dept_code=#{deptCode}
+ where del_flag = 0
+ and user_id =#{userId}
+ and dept_code=#{deptCode}
</update>
-
+ <update id="updateSysUserDeptForSync" parameterType="com.ruoyi.common.core.domain.entity.SysUserDept">
+ update sys_user_dept
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="deptId != null">dept_id =
+ #{deptId},
+ </if>
+ <if test="delFlag != null ">
+ del_flag = #{delFlag},
+ </if>
+ <if test="createTime != null ">
+ create_time = #{createTime},
+ </if>
+ <if test="updateTime != null ">
+ update_time = #{updateTime},
+ </if>
+ <if test="deptType != null ">
+ dept_type = #{deptType},
+ </if>
+ <if test="deptCode != null ">
+ dept_code = #{deptCode},
+ </if>
+ <if test="deptName != null ">
+ dept_name = #{deptName},
+ </if>
+ <if test="orgid != null ">
+ orgid = #{orgid},
+ </if>
+ <if test="campusid != null ">
+ campusid = #{campusid},
+ </if>
+ </trim>
+ where user_id =#{userId}
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="campusid != null and campusid != ''">
+ and campusid = #{campusid}
+ </if>
+ </update>
</mapper>
--
Gitblit v1.9.3