From 0c0a64646a2a04d24a3c7e28d1e9d2a96dc569e4 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 13 一月 2026 17:32:55 +0800
Subject: [PATCH] 【市一】获取随访统计比例sql调整

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 6385d61..06bb5ab 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1209,6 +1209,9 @@
             <if test="type != null">
                 and type = #{type}
             </if>
+            <if test="pageSize != null  and pageNum != null">
+                limit ${pageSize} OFFSET ${pageNum}
+            </if>
     </select>
 
     <select id="getSfStatisticsJoy" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
@@ -1341,8 +1344,8 @@
         </if>
         <if test="configValue != null and configValue != ''">
             SUM(CASE WHEN a.categoryid IN(${configValue})
-                AND a.matchedtext is not null
-                AND a.matchedtext != ''
+                AND IFNULL(a.matchedtext,a.asrtext) is not null
+                AND IFNULL(a.matchedtext,a.asrtext) != ''
             THEN 1 ELSE 0 END) AS joyCount,
         </if>
         a.sub_id as subTaskId
@@ -1368,6 +1371,13 @@
                     #{deptcode}
                 </foreach>
             </if>
+            <if test="subTaskIds != null and subTaskIds.size() > 0">
+                AND t.id IN
+                <foreach collection="subTaskIds" item="subTaskId" open="(" separator=","
+                         close=")">
+                    #{subTaskId}
+                </foreach>
+            </if>
             <if test="serviceType != null and serviceType.size() > 0">
                 AND t.service_type IN
                 <foreach collection="serviceType" item="serviceType" open="(" separator=","

--
Gitblit v1.9.3