From be4f9dc87f5b839895e3c5c0e323d680a33e4820 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 14 九月 2026 11:09:59 +0800
Subject: [PATCH] 1.省立同德新增满意度接口（未开发完） 2.字段修改将isMust修改成ismandatory （是否必填 1必填 2不必填(默认)）
---
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 107 insertions(+), 9 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
index 5a5fe37..6cfd428 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
@@ -7,6 +7,7 @@
<resultMap type="com.smartor.domain.SvyTaskTemplateScript" id="SvyTaskTemplateScriptResult">
<result property="id" column="id"/>
<result property="taskid" column="taskid"/>
+ <result property="ishide" column="ishide"/>
<result property="scriptno" column="scriptno"/>
<result property="templateID" column="templateID"/>
<result property="scriptid" column="scriptid"/>
@@ -14,7 +15,7 @@
<result property="language" column="language"/>
<result property="categoryName" column="categoryName"/>
<result property="scriptContent" column="script_content"/>
- <result property="isMust" column="is_must"/>
+ <result property="ismandatory" column="ismandatory"/>
<result property="delFlag" column="del_flag"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
@@ -43,13 +44,33 @@
<result property="score" column="score"/>
<result property="prompt" column="prompt"/>
<result property="groupName" column="group_name"/>
-
+ <result property="categoryid" column="categoryid"/>
+ <result property="dutyDeptName" column="duty_dept_name"/>
+ <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="selectSvyTaskTemplateScriptVo">
select id,
sort,
+ is_myd_exception,
+ dimension,
+ duty_dept_name,
+ duty_dept_code,
+ report_dept_name,
+ report_dept_code,
+ ishide,
prompt,
+ categoryid,
group_name,
branch_flag,
branch_nextscriptno,
@@ -61,15 +82,21 @@
scriptno,
templateID,
scriptid,
- script_topic, language, categoryName, script_content, is_must, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, value_type, targetoptions, script_type, targetid, targetvalue, next_scriptno, script_result, otherdata, picture_path
+ script_topic, language, categoryName, script_content, ismandatory, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, value_type, targetoptions, script_type, targetid, targetvalue, next_scriptno, script_result, otherdata, picture_path
+ , duty_dept_person_name, duty_dept_person_code, report_dept_person_name, report_dept_person_code
+ , circulation_dept_person_code, circulation_dept_person_name
from svy_task_template_script
</sql>
<select id="selectSvyTaskTemplateScriptList" parameterType="com.smartor.domain.SvyTaskTemplateScript"
resultMap="SvyTaskTemplateScriptResult">
<include refid="selectSvyTaskTemplateScriptVo"/>
- <where>
+ where del_flag=0
<if test="taskid != null ">and taskid = #{taskid}</if>
+ <if test="isMydException != null ">and is_myd_exception = #{isMydException}</if>
+ <if test="dimension != null ">and dimension = #{dimension}</if>
+ <if test="categoryid != null ">and categoryid = #{categoryid}</if>
+ <if test="ishide != null ">and ishide = #{ishide}</if>
<if test="scriptno != null ">and scriptno = #{scriptno}</if>
<if test="templateID != null ">and templateID = #{templateID}</if>
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
@@ -78,8 +105,20 @@
<if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
'%')
</if>
+ <if test="dutyDeptName != null and dutyDeptName != ''">and duty_dept_name like concat('%', #{dutyDeptName},
+ '%')
+ </if>
+ <if test="dutyDeptCode != null and dutyDeptCode != ''">and duty_dept_code like concat('%', #{dutyDeptCode},
+ '%')
+ </if>
+ <if test="reportDeptName != null and reportDeptName != ''">and report_dept_name like concat('%', #{reportDeptName},
+ '%')
+ </if>
+ <if test="reportDeptCode != null and reportDeptCode != ''">and report_dept_code like concat('%', #{reportDeptCode},
+ '%')
+ </if>
<if test="scriptContent != null and scriptContent != ''">and script_content = #{scriptContent}</if>
- <if test="isMust != null and isMust != ''">and is_must = #{isMust}</if>
+ <if test="ismandatory != null and ismandatory != ''">and ismandatory = #{ismandatory}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
@@ -104,7 +143,24 @@
<if test="branchNextscriptno != null and branchNextscriptno != ''">and branch_nextscriptno =
#{branchNextscriptno}
</if>
- </where>
+ <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>
</select>
<select id="selectSvyTaskTemplateScriptByID" parameterType="Long" resultMap="SvyTaskTemplateScriptResult">
@@ -124,7 +180,7 @@
<if test="language != null">language,</if>
<if test="categoryName != null">categoryName,</if>
<if test="scriptContent != null">script_content,</if>
- <if test="isMust != null">is_must,</if>
+ <if test="ismandatory != null">ismandatory,</if>
<if test="delFlag != null">del_flag,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
@@ -153,6 +209,20 @@
<if test="score != null ">score,</if>
<if test="prompt != null ">prompt,</if>
<if test="groupName != null ">group_name,</if>
+ <if test="ishide != null ">ishide,</if>
+ <if test="categoryid != null ">categoryid,</if>
+ <if test="dutyDeptName != null and dutyDeptName != ''">duty_dept_name,</if>
+ <if test="dutyDeptCode != null and dutyDeptCode != ''">duty_dept_code,</if>
+ <if test="reportDeptName != null and reportDeptName != ''">report_dept_name,</if>
+ <if test="reportDeptCode != null and reportDeptCode != ''"> report_dept_code,</if>
+ <if test="isMydException != null ">is_myd_exception,</if>
+ <if test="dimension != null ">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="taskid != null">#{taskid},</if>
@@ -163,7 +233,7 @@
<if test="language != null">#{language},</if>
<if test="categoryName != null">#{categoryName},</if>
<if test="scriptContent != null">#{scriptContent},</if>
- <if test="isMust != null">#{isMust},</if>
+ <if test="ismandatory != null">#{ismandatory},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -192,6 +262,20 @@
<if test="score != null ">#{score},</if>
<if test="prompt != null ">#{prompt},</if>
<if test="groupName != null ">#{groupName},</if>
+ <if test="ishide != null ">#{ishide},</if>
+ <if test="categoryid != null ">#{categoryid},</if>
+ <if test="dutyDeptName != null and dutyDeptName != ''">#{dutyDeptName},</if>
+ <if test="dutyDeptCode != null and dutyDeptCode != ''">#{dutyDeptCode},</if>
+ <if test="reportDeptName != null and reportDeptName != ''">#{reportDeptName},</if>
+ <if test="reportDeptCode != null and reportDeptCode != ''">#{reportDeptCode},</if>
+ <if test="isMydException != null ">#{isMydException},</if>
+ <if test="dimension != null ">#{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>
@@ -206,7 +290,7 @@
<if test="language != null">language = #{language},</if>
<if test="categoryName != null">categoryName = #{categoryName},</if>
<if test="scriptContent != null">script_content = #{scriptContent},</if>
- <if test="isMust != null">is_must = #{isMust},</if>
+ <if test="ismandatory != null">ismandatory = #{ismandatory},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
@@ -237,6 +321,20 @@
<if test="score != null">score = #{score},</if>
<if test="prompt != null">prompt = #{prompt},</if>
<if test="groupName != null ">group_name = #{groupName},</if>
+ <if test="ishide != null ">ishide = #{ishide},</if>
+ <if test="categoryid != null ">categoryid = #{categoryid},</if>
+ <if test="dutyDeptName != null and dutyDeptName != ''">duty_dept_name = #{dutyDeptName},</if>
+ <if test="dutyDeptCode != null and dutyDeptCode != ''"> duty_dept_code = #{dutyDeptCode},</if>
+ <if test="reportDeptName != null and reportDeptName != ''">report_dept_name = #{reportDeptName},</if>
+ <if test="reportDeptCode != null and reportDeptCode != ''">report_dept_code = #{reportDeptCode},</if>
+ <if test="isMydException != null ">is_myd_exception = #{isMydException},</if>
+ <if test="dimension != null ">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 = #{d}
</update>
--
Gitblit v1.9.3