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

功能优化

This commit is contained in:
mashuai 2025-01-23 09:49:01 +08:00
parent a3b562a77c
commit 3ca213b4a1
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
View File

@ -161,7 +161,10 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
* @param maCodeList * @param maCodeList
*/ */
private void setMaCodeDetails(BackApplyDetails details, List<MaCodeVo> maCodeList) { private void setMaCodeDetails(BackApplyDetails details, List<MaCodeVo> maCodeList) {
List<MaCodeVo> codeVos = maCodeList.stream().filter(maCodeVo -> StringUtils.isNotBlank(maCodeVo.getMaCode())).collect(Collectors.toList()); List<MaCodeVo> codeVos = maCodeList.stream()
.filter(maCodeVo -> StringUtils.isNotBlank(maCodeVo.getMaCode())
&& maCodeVo.getTypeId().equals(details.getTypeId().toString()))
.collect(Collectors.toList());
List<MaCodeDto> maCodeDtos = new ArrayList<>(); List<MaCodeDto> maCodeDtos = new ArrayList<>();
for (MaCodeVo maCodeVo : codeVos) { for (MaCodeVo maCodeVo : codeVos) {
MaCodeDto maCodeDto = new MaCodeDto(); MaCodeDto maCodeDto = new MaCodeDto();

11
bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml
View File

@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tt.`code` like concat('%', #{keyWord}, '%') or tt.`code` like concat('%', #{keyWord}, '%') or
tt2.`code` like concat('%', #{keyWord}, '%') or tt2.`code` like concat('%', #{keyWord}, '%') or
tt.remark like concat('%', #{keyWord}, '%') or tt.remark like concat('%', #{keyWord}, '%') or
su.nick_name like concat('%', #{keyWord}, '%') or su.nick_name like concat('%', #{keyWord}, '%')
) )
</if> </if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@ -129,6 +129,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
else false end) else false end)
where where
sad.task_id = #{taskId} sad.task_id = #{taskId}
<if test="keyWord != null and keyWord != ''">
and (
mt2.type_name like concat('%', #{keyWord}, '%') or
mt.type_name like concat('%', #{keyWord}, '%') or
mm.ma_code like concat('%', #{keyWord}, '%') or
su.nick_name like concat('%', #{keyWord}, '%') or
rar.scrap_reason like concat('%', #{keyWord}, '%')
)
</if>
GROUP BY sad.id GROUP BY sad.id
order by sad.create_time desc order by sad.create_time desc
</select> </select>