From 42fb200e5c378ab7090e3aa4627faee8912eb67d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 01 九月 2025 18:15:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
index fdb1fa6..bec2bd9 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
@@ -54,6 +54,7 @@
<result property="patid" column="patid"/>
<result property="guid" column="guid"/>
<result property="extemplateText" column="extemplate_text"/>
+ <result property="answerps" column="answerps"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskDetailTarget" id="ServiceSubtaskDetailTargetResult">
<result property="targetid" column="targetid"/>
@@ -111,7 +112,8 @@
update_by,
update_time,
value_type,
- create_by
+ create_by,
+ answerps
from service_subtask_detail
</sql>
@@ -402,17 +404,20 @@
</delete>
<select id="countPatByTarget" parameterType="Long" resultMap="ServiceSubtaskDetailTargetResult">
- SELECT
- service_task.taskid,
- service_subtask_detail.targetid,
- ivr_liba_target.targetname,
- service_subtask_detail.matchedtext,
- count(service_subtask_detail.matchedtext) count
+ SELECT service_task.taskid,
+ service_subtask_detail.targetid,
+ ivr_liba_target.targetname,
+ service_subtask_detail.matchedtext,
+ count(service_subtask_detail.matchedtext) count
FROM service_subtask_detail
- JOIN service_task ON service_task.taskid = service_subtask_detail.taskid
- JOIN ivr_liba_target ON ivr_liba_target.id = service_subtask_detail.targetid
+ JOIN service_task
+ ON service_task.taskid = service_subtask_detail.taskid
+ JOIN ivr_liba_target ON ivr_liba_target.id = service_subtask_detail.targetid
WHERE
- targetid = #{targetid}
- GROUP BY matchedtext
+ targetid = #{targetid}
+ GROUP BY service_task.taskid,
+ service_subtask_detail.targetid,
+ ivr_liba_target.targetname,
+ service_subtask_detail.matchedtext
</select>
</mapper>
--
Gitblit v1.9.3