From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
index 6fdf155..e348d2d 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
@@ -27,7 +27,6 @@
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
<result property="deptNames" column="dept_names"/>
- <result property="labelInfo" column="label_info"/>
<result property="campus" column="campus"/>
<result property="suitway" column="suitway"/>
<result property="otherdata" column="otherdata"/>
@@ -35,11 +34,17 @@
<result property="reply" column="reply"/>
<result property="scriptScore" column="script_score"/>
<result property="scoreType" column="score_type"/>
+ <result property="prologue" column="prologue"/>
+ <result property="instruction" column="instruction"/>
+ <result property="conclusion" column="conclusion"/>
</resultMap>
<sql id="selectSvyLibTemplateVo">
select svyid,
categoryid,
+ instruction,
+ prologue,
+ conclusion,
value_type,
reply,
score_type,
@@ -63,7 +68,6 @@
isupload,
upload_time,
dept_names,
- label_info,
campus,
suitway,
script_score,
@@ -75,6 +79,9 @@
resultMap="SvyLibTemplateResult">
SELECT
a.svyid,
+ a.conclusion,
+ a.instruction,
+ a.prologue,
a.categoryid,
a.svycode,
a.svyname,
@@ -97,7 +104,6 @@
a.upload_time,
a.dept_names,
a.value_type,
- a.label_info,
a.reply,
a.campus,
a.suitway,
@@ -108,7 +114,7 @@
b.icd10name
FROM
svy_lib_template a
- JOIN (select outid,GROUP_CONCAT(icd10code) as icd10code,GROUP_CONCAT(icd10name) as icd10name from
+ LEFT JOIN (select outid,GROUP_CONCAT(icd10code) as icd10code,GROUP_CONCAT(icd10name) as icd10name from
icd10_association group by outid) b ON a.del_flag = 0
AND a.svyid = b.outid
<where>
@@ -116,9 +122,10 @@
<if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
<if test="svyid != null ">and a.svyid = #{svyid}</if>
<if test="svyname != null and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if>
- <if test="description != null and description != ''">and a.icdname like concat('%', #{description}, '%')
+ <if test="description != null and description != ''">and b.icd10name like concat('%', #{description}, '%')
</if>
</where>
+ order by a.create_time desc
</select>
<select id="selectSvyLibTemplateBySvyid" parameterType="Long" resultMap="SvyLibTemplateResult">
@@ -151,7 +158,6 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="deptNames != null">dept_names,</if>
- <if test="labelInfo != null">label_info,</if>
<if test="campus != null">campus,</if>
<if test="suitway != null">suitway,</if>
<if test="otherdata != null">otherdata,</if>
@@ -159,6 +165,9 @@
<if test="reply != null">reply,</if>
<if test="scriptScore != null">script_score,</if>
<if test="scoreType != null">score_type,</if>
+ <if test="conclusion != null">conclusion,</if>
+ <if test="instruction != null">instruction,</if>
+ <if test="prologue != null">prologue,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="categoryid != null">#{categoryid},</if>
@@ -182,7 +191,6 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="deptNames != null">#{deptNames},</if>
- <if test="labelInfo != null">#{labelInfo},</if>
<if test="campus != null">#{campus},</if>
<if test="suitway != null">#{suitway},</if>
<if test="otherdata != null">#{otherdata},</if>
@@ -190,6 +198,9 @@
<if test="reply != null">#{reply},</if>
<if test="scriptScore != null">#{scriptScore},</if>
<if test="scoreType != null">#{scoreType},</if>
+ <if test="conclusion != null">#{conclusion},</if>
+ <if test="instruction != null">#{instruction},</if>
+ <if test="prologue != null">#{prologue},</if>
</trim>
</insert>
@@ -217,7 +228,6 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="deptNames != null">dept_names=#{deptNames},</if>
- <if test="labelInfo != null">label_info=#{labelInfo},</if>
<if test="campus != null">campus=#{campus},</if>
<if test="suitway != null">suitway=#{suitway},</if>
<if test="otherdata != null">otherdata=#{otherdata},</if>
@@ -225,6 +235,9 @@
<if test="reply != null">reply = #{reply},</if>
<if test="scriptScore != null">script_score = #{scriptScore},</if>
<if test="scoreType != null">score_type = #{scoreType},</if>
+ <if test="conclusion != null">conclusion=#{conclusion},</if>
+ <if test="instruction != null">instruction=#{instruction},</if>
+ <if test="prologue != null">prologue=#{prologue},</if>
</trim>
where svyid = #{svyid}
</update>
--
Gitblit v1.9.3