From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 12 六月 2024 09:04:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis
---
ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml
index fbe6e88..18f994c 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml
@@ -16,6 +16,7 @@
<result property="deleted" column="deleted"/>
<result property="designId" column="design_id"/>
<result property="qybz" column="qybz"/>
+ <result property="deptId" column="dept_id"/>
</resultMap>
<resultMap id="TjSurveyTemplateTjSurveyTempQuesResult" type="TjSurveyTemplate" extends="TjSurveyTemplateResult">
@@ -78,6 +79,7 @@
a.deleted,
a.design_id,
a.qybz,
+ a.dept_id,
b.tqid as
sub_tqid,
b.mid as
@@ -156,6 +158,8 @@
</if>
<if test="qybz != null">qybz,
</if>
+ <if test="deptId != null">dept_id,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="tempName != null">#{tempName},
@@ -176,8 +180,8 @@
</if>
<if test="designId != null">#{designId},
</if>
- <if test="qybz != null">#{qybz},
- </if>
+ <if test="qybz != null">#{qybz},</if>
+ <if test="deptId != null">#{deptId},</if>
</trim>
</insert>
@@ -213,6 +217,8 @@
</if>
<if test="qybz != null">qybz =
#{qybz},
+ </if>
+ <if test="deptId != null">dept_id= #{deptId},
</if>
</trim>
where mid = #{mid}
@@ -261,5 +267,25 @@
</foreach>
</insert>
+ <sql id="selectDictDataVo">
+ select dict_code id,
+ dict_label name,
+ dict_value vaule
+ from sys_dict_data
+ </sql>
+
+ <select id="selectDictDataList" parameterType="SysDictData" resultType="com.ltkj.hosp.domain.TreeTjSurveryTemplate">
+ <include refid="selectDictDataVo"/>
+ <where>
+ <if test="dictType != null and dictType != ''">
+ AND dict_type = #{dictType}
+ </if>
+
+ <if test="status != null and status != ''">
+ AND status = #{status}
+ </if>
+ </where>
+ order by dict_sort asc
+ </select>
</mapper>
--
Gitblit v1.8.0