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

app领用记录查询bug修复

This commit is contained in:
hongchao 2025-03-18 18:19:37 +08:00
parent 898ed313e6
commit f20c5d54d0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,11 +208,14 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
.filter(item -> containsKeyword(item, keyWord)) .filter(item -> containsKeyword(item, keyWord))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
if (taskStatus != null) { if(leaseApplyInfo.getIsApp()==null){
list = list.stream() if (taskStatus != null) {
.filter(item -> item.getTaskStatus().equals(taskStatus)) list = list.stream()
.collect(Collectors.toList()); .filter(item -> item.getTaskStatus().equals(taskStatus))
.collect(Collectors.toList());
}
} }
} }
return list; return list;
} }

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

@ -448,8 +448,8 @@
<if test="costBearingParty != null and costBearingParty != ''">and lai.cost_bearing_party = <if test="costBearingParty != null and costBearingParty != ''">and lai.cost_bearing_party =
#{costBearingParty} #{costBearingParty}
</if> </if>
<if test="isApp != null and taskStatus==1">and (tt.task_status = 0 or tt.task_status = 1 or tt.task_status = 2) </if> <if test="isApp != null and taskStatus==1">and (tt.task_status = 0 or tt.task_status = 6) </if>
<if test="isApp != null and taskStatus==3">and (tt.task_status = 3 or tt.task_status = 4)</if> <if test="isApp != null and taskStatus==3">and (tt.task_status = 1 )</if>
GROUP BY lai.id GROUP BY lai.id
ORDER BY tt.task_status,tt.create_time desc ORDER BY tt.task_status,tt.create_time desc
</select> </select>