From 0d10bc99eec75672b049339399e4f762fbd9746e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 108 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
index f22a134..416c42d 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
@@ -50,15 +50,30 @@
<result property="dutyDeptCode" column="duty_dept_code"/>
<result property="reportDeptCode" column="report_dept_name"/>
<result property="reportDeptName" column="report_dept_code"/>
+ <result property="dutyDeptPersonName" column="duty_dept_person_name"/>
+ <result property="dutyDeptPersonCode" column="duty_dept_person_code"/>
+ <result property="reportDeptPersonCode" column="report_dept_person_name"/>
+ <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>
<sql id="selectSvyLibTemplateScriptVo">
select id,
script_type,
+ is_myd_exception,
+ dimension,
duty_dept_name,
duty_dept_code,
report_dept_name,
report_dept_code,
+ duty_dept_person_name,
+ duty_dept_person_code,
+ report_dept_person_name,
+ report_dept_person_code,
targetid,
group_name,
targetname,
@@ -95,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>
@@ -105,6 +121,8 @@
and del_flag = 0
<if test="nextScriptno != null ">and next_scriptno = #{nextScriptno}</if>
<if test="scriptType != null and scriptType != ''">and script_type = #{scriptType}</if>
+ <if test="isMydException != null and isMydException != ''">and is_myd_exception = #{isMydException}</if>
+ <if test="dimension != null and dimension != ''">and dimension = #{dimension}</if>
<if test="scriptno != null and scriptno != ''">and scriptno = #{scriptno}</if>
<if test="scriptid != null">and scriptid = #{scriptid}</if>
<if test="scriptDesc != null and scriptDesc != ''">and script_desc = #{scriptDesc}</if>
@@ -161,7 +179,68 @@
#{categoryid}
</foreach>
</if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">and duty_dept_person_name like concat('%',
+ #{dutyDeptPersonName},
+ '%')
+ </if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">and duty_dept_person_code like concat('%',
+ #{dutyDeptPersonCode},
+ '%')
+ </if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">and report_dept_person_name like concat('%',
+ #{reportDeptPersonName},
+ '%')
+ </if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">and report_dept_person_code like concat('%',
+ #{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>
+
+ <select id="selectSLTScriptListBydimension" parameterType="com.smartor.domain.SvyLibTemplateScriptVO"
+ resultMap="SvyLibTemplateScriptResult">
+ <include refid="selectSvyLibTemplateScriptVo"/>
+ <where>del_flag=0
+ <if test="dimensionList != null ">and dimension in
+ <foreach item="dimension" collection="dimensionList" open="(" separator="," close=")">
+ #{dimension}
+ </foreach>
+ </if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">and duty_dept_person_name like concat('%',
+ #{dutyDeptPersonName},
+ '%')
+ </if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">and duty_dept_person_code like concat('%',
+ #{dutyDeptPersonCode},
+ '%')
+ </if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">and report_dept_person_name like concat('%',
+ #{reportDeptPersonName},
+ '%')
+ </if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">and report_dept_person_code like concat('%',
+ #{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="dimensionList == null ">and dimension IS NOT NULL </if>
+ </where>
</select>
<select id="selectSvyLibTemplateScriptByTopicid" parameterType="Long" resultMap="SvyLibTemplateScriptResult">
@@ -218,6 +297,14 @@
<if test="reportDeptName != null and reportDeptName != ''">report_dept_name,</if>
<if test="reportDeptCode != null and reportDeptCode != ''">report_dept_code,</if>
<if test="categoryName != null and categoryName != ''">categoryName,</if>
+ <if test="isMydException != null and isMydException != ''">is_myd_exception,</if>
+ <if test="dimension != null and dimension != ''">dimension,</if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">duty_dept_person_name,</if>
+ <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>
@@ -265,6 +352,14 @@
<if test="reportDeptName != null and reportDeptName != ''">#{reportDeptName},</if>
<if test="reportDeptCode != null and reportDeptCode != ''">#{reportDeptCode},</if>
<if test="categoryName != null and categoryName != ''">#{categoryName},</if>
+ <if test="isMydException != null and isMydException != ''">#{isMydException},</if>
+ <if test="dimension != null and dimension != ''">#{dimension},</if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">#{dutyDeptPersonName},</if>
+ <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>
@@ -318,6 +413,14 @@
<if test="reportDeptName != null and reportDeptName != ''">report_dept_name = #{reportDeptName},</if>
<if test="reportDeptCode != null and reportDeptCode != ''">report_dept_code = #{reportDeptCode},</if>
<if test="categoryName != null and categoryName != ''">categoryName = #{categoryName},</if>
+ <if test="isMydException != null and isMydException != ''">is_myd_exception = #{isMydException},</if>
+ <if test="dimension != null and dimension != ''">dimension = #{dimension},</if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">duty_dept_person_name = #{dutyDeptPersonName},</if>
+ <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>
@@ -335,14 +438,14 @@
</foreach>
</delete>
- <select id="querySvyLibTemplateIds" resultMap="SvyLibTemplateScriptResult">
+ <select id="querySvyLibTemplateIds" resultMap="SvyLibTemplateScriptResult">
<include refid="selectSvyLibTemplateScriptVo"/>
where del_flag=0
<if test="scriptCategoryids != null and scriptCategoryids.size > 0">
- and categoryid in
- <foreach item="scriptCategoryid" collection="scriptCategoryids" open="(" separator="," close=")">
- #{scriptCategoryid}
- </foreach>
+ and categoryid in
+ <foreach item="scriptCategoryid" collection="scriptCategoryids" open="(" separator="," close=")">
+ #{scriptCategoryid}
+ </foreach>
</if>
</select>
</mapper>
--
Gitblit v1.9.3