bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2025-05-20 17:59:01 +08:00
parent e11d095b6d
commit 42002e753a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java
View File

@ -108,7 +108,7 @@ public class ArchivesServiceImpl implements ArchivesService {
@Override @Override
public AjaxResult edit(ArchivesInfo archiveInfo) { public AjaxResult edit(ArchivesInfo archiveInfo) {
// 根据类型名称和上级id查询，同级下名称不能重复 // 根据类型名称和上级id查询，同级下名称不能重复
archiveInfo.setParentId(archiveInfo.getInfoId() != null ? archiveInfo.getInfoId() : 0L); archiveInfo.setParentId(archiveInfo.getParentId() != null ? archiveInfo.getParentId() : 0L);
ArchivesInfo info = archivesMapper.selectByName(archiveInfo); ArchivesInfo info = archivesMapper.selectByName(archiveInfo);
if (info != null && !archiveInfo.getInfoId().equals(info.getInfoId())) { if (info != null && !archiveInfo.getInfoId().equals(info.getInfoId())) {
return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg()); return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg());

10
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
View File

@ -583,7 +583,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
m.test_load as testLoad, m.test_load as testLoad,
m.holding_time as holdingTime, m.holding_time as holdingTime,
m.remark as remark,whi.house_name as houseName, m.remark as remark,whi.house_name as houseName,
m.fac_model AS facModel,su.user_name as keeperNickName,su2.user_name as repairNickName m.fac_model AS facModel,su.user_name as keeperNickName,su2.user_name as repairNickName,
m.sort_num as sortNum
FROM FROM
ma_type m ma_type m
LEFT JOIN ma_type m1 ON m.parent_id = m1.type_id and m1.del_flag = '0' LEFT JOIN ma_type m1 ON m.parent_id = m1.type_id and m1.del_flag = '0'
@ -604,6 +605,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) )
</if> </if>
GROUP BY m.type_id GROUP BY m.type_id
ORDER BY
m.sort_num ASC,
CASE
WHEN m.update_time > m.create_time THEN
m.update_time ELSE m.create_time
END DESC,
m.create_time DESC
</select> </select>
<select id="queryByNameAndParentId" resultType="com.bonus.material.ma.domain.Type"> <select id="queryByNameAndParentId" resultType="com.bonus.material.ma.domain.Type">
select select