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)
---
ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
index 1efe6f1..ed3a343 100644
--- a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
@@ -27,7 +27,10 @@
<select id="selectEquipmentinfoList" parameterType="Equipmentinfo" resultMap="EquipmentinfoResult">
<include refid="selectEquipmentinfoVo"/>
- <where>
+ where 1=1
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
<if test="devtype != null "> and devtype = #{devtype}</if>
<if test="equipmentname != null and equipmentname != ''"> and equipmentname like concat('%', #{equipmentname}, '%')</if>
<if test="modnum != null and modnum != ''"> and modnum = #{modnum}</if>
@@ -40,7 +43,6 @@
<if test="storePlace != null and storePlace != ''"> and storePlace = #{storePlace}</if>
<if test="technData != null and technData != ''"> and technData = #{technData}</if>
<if test="statusid != null "> and statusid = #{statusid}</if>
- </where>
</select>
<select id="selectEquipmentinfoById" parameterType="Long" resultMap="EquipmentinfoResult">
--
Gitblit v1.9.3