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

bug修复

This commit is contained in:
马三炮 2025-03-19 15:37:04 +08:00
parent 4e58bc5fa5
commit 3998874d75
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
View File

@ -401,6 +401,15 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
log.info("用户id为{}",userId); log.info("用户id为{}",userId);
List<LeaseApplyInfo> list = mapper.selectAuditLeaseApplyInfoList(leaseApplyInfo); List<LeaseApplyInfo> list = mapper.selectAuditLeaseApplyInfoList(leaseApplyInfo);
try { try {
if (!CollectionUtils.isEmpty(list)) {
String keyWord = leaseApplyInfo.getKeyWord();
// 如果关键字不为空，进行过滤
if (!StringUtils.isBlank(keyWord)) {
list = list.stream()
.filter(item -> containsKeyword(item, keyWord))
.collect(Collectors.toList());
}
}
for (LeaseApplyInfo leaseApplyInfoNew : list) { for (LeaseApplyInfo leaseApplyInfoNew : list) {
//获取当前节点，并根据当前节点获取审核人审核的角色信息 //获取当前节点，并根据当前节点获取审核人审核的角色信息
if (leaseApplyInfoNew.getNodeId()!=null){ if (leaseApplyInfoNew.getNodeId()!=null){
@ -466,8 +475,8 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
*/ */
private boolean containsKeyword(LeaseApplyInfo item, String keyWord) { private boolean containsKeyword(LeaseApplyInfo item, String keyWord) {
return (item.getMaTypeNames() != null && item.getMaTypeNames().contains(keyWord)) || return (item.getMaTypeNames() != null && item.getMaTypeNames().contains(keyWord)) ||
(item.getUnitName() != null && item.getUnitName().contains(keyWord)) || (item.getLeaseUnit() != null && item.getLeaseUnit().contains(keyWord)) ||
(item.getProjectName() != null && item.getProjectName().contains(keyWord)) || (item.getLeaseProject() != null && item.getLeaseProject().contains(keyWord)) ||
(item.getCode() != null && item.getCode().contains(keyWord)) || (item.getCode() != null && item.getCode().contains(keyWord)) ||
(item.getCreateBy() != null && item.getCreateBy().contains(keyWord)) || (item.getCreateBy() != null && item.getCreateBy().contains(keyWord)) ||
(item.getLeasePerson() != null && item.getLeasePerson().contains(keyWord)) || (item.getLeasePerson() != null && item.getLeasePerson().contains(keyWord)) ||

6
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
View File

@ -610,12 +610,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="keyWord != null and keyWord != ''">
and (bu.unit_name like concat('%', #{keyWord}, '%') or
bp.pro_name like concat('%', #{keyWord}, '%') or
mt1.type_name like concat('%', #{keyWord}, '%')
)
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if> </if>