From b44db60114b159cd438a0fe0259b9ddc94a16ba3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 06 一月 2026 16:45:07 +0800
Subject: [PATCH] 【市一】随访满意度明细调整

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 82214bc..7915cd4 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -102,13 +102,17 @@
 
     <resultMap type="com.smartor.domain.ServiceSubtaskScriptCount" id="ServiceSubtaskScriptCountResult">
         <result property="scriptid" column="scriptid"/>
+        <result property="templateid" column="templateid"/>
+        <result property="scriptType" column="script_type"/>
         <result property="scriptContent" column="script_content"/>
+        <result property="subtaskType" column="subtask_type"/>
         <result property="completedQuantity" column="completed_quantity"/>
         <result property="allQuantity" column="all_quantity"/>
         <result property="completedPercentage" column="completed_percentage"/>
         <result property="optionText" column="option_text"/>
         <result property="chosenQuantity" column="chosen_quantity"/>
         <result property="chosenPercentage" column="chosen_percentage"/>
+        <result property="options" column="options"/>
     </resultMap>
 
     <sql id="selectServiceSubtaskVo">
@@ -1355,7 +1359,10 @@
             resultMap="ServiceSubtaskScriptCountResult">
         SELECT
         a.id as scriptid,
+        a.templateid as templateid,
+        a.script_type,
         a.script_content,
+        b.subtask_type,
         b.completed_quantity,
         b.all_quantity,
         ROUND(b.completed_quantity/b.all_quantity,2) as completed_percentage
@@ -1369,6 +1376,7 @@
         INNER JOIN(
         SELECT
         ssd.scriptid AS scriptid,
+        ss.type as subtask_type,
         SUM(CASE WHEN IFNULL(ssd.matchedtext,ssd.asrtext) IS NOT NULL
         AND IFNULL(ssd.matchedtext,ssd.asrtext) != '' THEN 1
         ELSE 0 END) AS completed_quantity,

--
Gitblit v1.9.3