From 54c0125835e850b97793601ac45ee62fa1c4b12e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 27 Oct 2023 09:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/mapper/SysDictTypeMapper.xml | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml b/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
index 6eaedd4..29aebce 100644
--- a/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
+++ b/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
@@ -7,9 +7,33 @@
<id column="id" property="id" />
<result column="name" property="name" />
<result column="desc" property="desc" />
+ <result column="system" property="system" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="is_delete" property="isDelete" />
</resultMap>
+ <select id="selectCodeList" resultType="com.moral.api.entity.SysDictData">
+ select t1.id,t1.dict_type_id,t1.dataKey,t1.dataValue from sys_dict_type t
+ left join sys_dict_data t1 on t1.dict_type_id = t.id
+ where t.is_delete = 0 and t.name = #{code} and t1.dataKey = #{id} and t1.is_delete = 0
+ order by t1.create_time desc
+ </select>
+
+ <select id="selectIdList" resultType="com.moral.api.entity.SysDictData">
+ select DISTINCT t1.id,t1.dict_type_id,t1.dataKey,t1.dataValue from sys_dict_type t
+ left join sys_dict_data t1 on t1.dict_type_id = t.id
+ where t.is_delete = 0 and t.name = #{code} and
+ t1.dataKey in
+ <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ and t1.is_delete = 0
+ order by t1.create_time desc
+ </select>
+
+ <select id="selectFind" resultType="com.moral.api.entity.SysDictType">
+ select * from sys_dict_type
+ where sys_dict_type.name= #{name} AND is_delete = 0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0