From 5bbd99ba550aa2e8cd8da36644018981ca1a1921 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 23 九月 2026 16:58:51 +0800
Subject: [PATCH] 【丽水】更新同步
---
smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
index 6698f3f..16e2770 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
@@ -56,6 +56,8 @@
<result property="reportDeptPersonName" column="report_dept_person_code"/>
<result property="isMydException" column="is_myd_exception"/>
<result property="dimension" column="dimension"/>
+ <result property="circulationDeptPersonCode" column="circulation_dept_person_code"/>
+ <result property="circulationDeptPersonName" column="circulation_dept_person_name"/>
</resultMap>
@@ -108,6 +110,7 @@
script_picture,
script_topic,
isavailable, language, otherdata, value_type, reply, scoretype
+ , circulation_dept_person_code, circulation_dept_person_name
from svy_lib_template_script
</sql>
@@ -192,6 +195,14 @@
#{reportDeptPersonCode},
'%')
</if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">and circulation_dept_person_code like concat('%',
+ #{circulationDeptPersonCode},
+ '%')
+ </if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">and circulation_dept_person_name like concat('%',
+ #{circulationDeptPersonName},
+ '%')
+ </if>
<if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
@@ -199,7 +210,7 @@
resultMap="SvyLibTemplateScriptResult">
<include refid="selectSvyLibTemplateScriptVo"/>
<where>del_flag=0
- <if test="dimensionList != null ">and dimension in
+ <if test="dimensionList != null and dimensionList.size() > 0">and dimension in
<foreach item="dimension" collection="dimensionList" open="(" separator="," close=")">
#{dimension}
</foreach>
@@ -220,7 +231,15 @@
#{reportDeptPersonCode},
'%')
</if>
- <if test="dimensionList == null ">and dimension IS NOT NULL </if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">and circulation_dept_person_code like concat('%',
+ #{circulationDeptPersonCode},
+ '%')
+ </if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">and circulation_dept_person_name like concat('%',
+ #{circulationDeptPersonName},
+ '%')
+ </if>
+ <if test="dimensionList == null or dimensionList.size() == 0">and dimension IS NOT NULL </if>
</where>
</select>
@@ -284,6 +303,8 @@
<if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">duty_dept_person_code,</if>
<if test="reportDeptPersonName != null and reportDeptPersonName != ''">report_dept_person_name,</if>
<if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">report_dept_person_code,</if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">circulation_dept_person_code,</if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">circulation_dept_person_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="nextScriptno != null">#{nextScriptno},</if>
@@ -337,6 +358,8 @@
<if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">#{dutyDeptPersonCode},</if>
<if test="reportDeptPersonName != null and reportDeptPersonName != ''">#{reportDeptPersonName},</if>
<if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">#{reportDeptPersonCode},</if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">#{circulationDeptPersonCode},</if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">#{circulationDeptPersonName},</if>
</trim>
</insert>
@@ -396,6 +419,8 @@
<if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">duty_dept_person_code = #{dutyDeptPersonCode},</if>
<if test="reportDeptPersonName != null and reportDeptPersonName != ''">report_dept_person_name = #{reportDeptPersonName},</if>
<if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">report_dept_person_code = #{reportDeptPersonCode},</if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">circulation_dept_person_name = #{circulationDeptPersonName},</if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">circulation_dept_person_code = #{circulationDeptPersonCode},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3