From 2cfa20c70ea84fa3435f3fd1e653c5ae60a3fc1e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 06 一月 2026 16:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index fb3ad76..7915cd4 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -103,7 +103,9 @@
<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"/>
@@ -1358,15 +1360,11 @@
SELECT
a.id as scriptid,
a.templateid as templateid,
+ a.script_type,
a.script_content,
+ b.subtask_type,
b.completed_quantity,
b.all_quantity,
- <if test="type == 1">
- '' as options,
- </if>
- <if test="type == 2">
- c.options,
- </if>
ROUND(b.completed_quantity/b.all_quantity,2) as completed_percentage
FROM
<if test="type == 1">
@@ -1378,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,
@@ -1425,14 +1424,6 @@
</if>
group by ssd.scriptid) b
ON a.id = b.scriptid
- <!-- 缁熻闂嵎 -->
- <if test="type == 2">
- LEFT JOIN (
- SELECT target.scriptid,GROUP_CONCAT(optioncontent) as options
- FROM svy_task_template_targetoption target
- group by target.scriptid
- ) c ON a.scriptid = c.scriptid
- </if>
</select>
<select id="getSfStatisticsScriptItemDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
--
Gitblit v1.9.3