From 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 11:31:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/system/SysDictTypeMapper.xml | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/system/SysDictTypeMapper.xml b/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 1cf1349..dd2342e 100644
--- a/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -14,9 +14,9 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
-
+
<sql id="selectDictTypeVo">
- select dict_id, dict_name, dict_type, status, create_by, create_time, remark
+ select dict_id, dict_name, dict_type, status, create_by, create_time, remark
from sys_dict_type
</sql>
@@ -39,36 +39,37 @@
and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
</if>
</where>
+ order by create_time desc
</select>
-
+
<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/>
</select>
-
+
<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/>
where dict_id = #{dictId}
</select>
-
+
<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/>
where dict_type = #{dictType}
</select>
-
+
<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/>
where dict_type = #{dictType} limit 1
</select>
-
+
<delete id="deleteDictTypeById" parameterType="Long">
delete from sys_dict_type where dict_id = #{dictId}
</delete>
-
+
<delete id="deleteDictTypeByIds" parameterType="Long">
delete from sys_dict_type where dict_id in
<foreach collection="array" item="dictId" open="(" separator="," close=")">
#{dictId}
- </foreach>
+ </foreach>
</delete>
<update id="updateDictType" parameterType="com.ruoyi.project.system.domain.SysDictType">
@@ -83,7 +84,7 @@
</set>
where dict_id = #{dictId}
</update>
-
+
<insert id="insertDictType" parameterType="com.ruoyi.project.system.domain.SysDictType">
insert into sys_dict_type(
<if test="dictName != null and dictName != ''">dict_name,</if>
@@ -101,5 +102,5 @@
sysdate()
)
</insert>
-
-</mapper>
\ No newline at end of file
+
+</mapper>
--
Gitblit v1.9.3