gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/group1-dict'

pull/3/head
fengshuonan 2021-01-13 20:04:19 +08:00
parent 3a2d344734 1e75db7aa2
commit c1bc47168d
2 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictMapper.xml
View File

@ -3,18 +3,19 @@
<mapper namespace="cn.stylefeng.roses.kernel.dict.modular.mapper.DictMapper">
<select id="findDetail" resultType="cn.stylefeng.roses.kernel.dict.modular.entity.SysDict" parameterType="long">
SELECT dict.dict_id AS dictId,
dict.dict_code AS dictCode,
dict.dict_name as dictName,
dict.dict_encode as dictEncode,
dict.dict_sort as dictSort,
dict.dict_type_code AS dictTypeCode,
dict.dict_short_name AS dictShortName,
dict.dict_short_code AS dictShortCode,
dict.dict_parent_id AS dictParentId,
dict.status_flag AS statusFlag,
dict.create_time AS createTime,
type.dict_type_name AS dictTypeName
SELECT dict.dict_id AS dictId,
dict.dict_code AS dictCode,
dict.dict_name as dictName,
dict.dict_name_pinyin as dictNamePinyin,
dict.dict_encode as dictEncode,
dict.dict_sort as dictSort,
dict.dict_type_code AS dictTypeCode,
dict.dict_short_name AS dictShortName,
dict.dict_short_code AS dictShortCode,
dict.dict_parent_id AS dictParentId,
dict.status_flag AS statusFlag,
dict.create_time AS createTime,
type.dict_type_name AS dictTypeName
FROM sys_dict dict
INNER JOIN sys_dict_type type ON dict.dict_type_code = type.dict_type_code
WHERE dict.del_flag = 'N'
@ -23,18 +24,19 @@
<select id="findList" resultType="cn.stylefeng.roses.kernel.dict.modular.entity.SysDict">
SELECT type.dict_type_name as dictTypeName,
dict.dict_id AS dictId,
dict.dict_code AS dictCode,
dict.dict_encode as dictEncode,
dict.dict_sort as dictSort,
dict.dict_name as dictName,
dict.dict_type_code AS dictTypeCode,
dict.dict_short_name AS dictShortName,
dict.dict_short_code AS dictShortCode,
dict.dict_parent_id AS dictParentId,
dict.status_flag AS statusFlag,
dict.create_time AS createTime,
pDict.dict_name AS parentName
dict.dict_id AS dictId,
dict.dict_code AS dictCode,
dict.dict_encode as dictEncode,
dict.dict_sort as dictSort,
dict.dict_name as dictName,
dict.dict_name_pinyin as dictNamePinyin,
dict.dict_type_code AS dictTypeCode,
dict.dict_short_name AS dictShortName,
dict.dict_short_code AS dictShortCode,
dict.dict_parent_id AS dictParentId,
dict.status_flag AS statusFlag,
dict.create_time AS createTime,
pDict.dict_name AS parentName
FROM sys_dict dict
INNER JOIN sys_dict_type type ON dict.dict_type_code = type.dict_type_code
LEFT JOIN sys_dict pDict ON pDict.dict_id = dict.dict_parent_id
@ -78,7 +80,7 @@
sys_dict
SET dict_pids = replace(dict_pids, #{paramCondition.oldParentIds}, #{paramCondition.newParentIds}),
update_time = #{paramCondition.updateTime},
update_account_id = #{paramCondition.updateUser}
update_user = #{paramCondition.updateUser}
WHERE dict_pids LIKE CONCAT('%', #{paramCondition.oldParentIds}, '%')
</update>

20
kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictTypeMapper.xml
View File

@ -19,14 +19,15 @@
<!--查询字典类型列表-->
<select id="findList" resultType="cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType">
SELECT dict_type_id AS dictTypeId,
dict_type_class AS dictTypeClass,
dict_type_bus_code AS dictTypeBusCode,
dict_type_code AS dictTypeCode,
dict_type_name AS dictTypeName,
dict_type_desc AS dictTypeDesc,
status_flag AS statusFlag,
dict_type_sort AS dictTypeSort
SELECT dict_type_id AS dictTypeId,
dict_type_class AS dictTypeClass,
dict_type_bus_code AS dictTypeBusCode,
dict_type_name_pinyin AS dictTypeNamePinyin,
dict_type_code AS dictTypeCode,
dict_type_name AS dictTypeName,
dict_type_desc AS dictTypeDesc,
status_flag AS statusFlag,
dict_type_sort AS dictTypeSort
FROM sys_dict_type
WHERE del_flag = 'N'
<if test="dictTypeRequest.dictTypeName != null and dictTypeRequest.dictTypeName !=''">
@ -37,6 +38,9 @@
dict_type_name_pinyin like concat('%', #{dictTypeRequest.dictTypeName}, '%')
)
</if>
<if test="dictTypeRequest.dictTypeClass != null and dictTypeRequest.dictTypeClass !=''">
AND dict_type_class = #{dictTypeRequest.dictTypeClass}
</if>
<if test="dictTypeRequest.dictTypeDesc != null and dictTypeRequest.dictTypeDesc !=''">
AND dict_type_desc like CONCAT('%', #{dictTypeRequest.dictTypeDesc}, '%')
</if>