From 5dcd6447f315e821727508cd26bf05f8220b39c8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 09 四月 2026 13:54:47 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
index 3d10b0a..4595c28 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
@@ -108,7 +108,7 @@
from service_subtask_detail_trace
</sql>
- <select id="selectServiceSubtaskDetailTtraceList" parameterType="com.smartor.domain.ServiceSubtaskDetailTrace"
+ <select id="selectServiceSubtaskDetailTtraceList" parameterType="com.smartor.domain.VO.ServiceSubtaskDetailTraceVO"
resultMap="ServiceSubtaskDetailTtraceResult">
<include refid="selectServiceSubtaskDetailTtraceVo"/>
where del_flag=0
@@ -160,8 +160,11 @@
<if test="valueType != null and valueType != ''">
and value_type = #{valueType}
</if>
- <if test="scriptid != null ">
- and scriptid = #{scriptid}
+ <if test="scriptids != null ">
+ and scriptid in
+ <foreach item="scriptid" collection="scriptids" open="(" separator="," close=")">
+ #{scriptid}
+ </foreach>
</if>
<if test="answerps != null and answerps != ''">
and answerps = #{answerps}
@@ -268,6 +271,9 @@
<if test="type != null and type != ''">
and type = #{type}
</if>
+ <if test="templateType != null">
+ and template_type = #{templateType}
+ </if>
</select>
--
Gitblit v1.9.3