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

优化

This commit is contained in:
mashuai 2025-08-15 19:08:49 +08:00
parent 7d4c560eff
commit a637da88e6
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,11 +373,18 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
if(leaseApplyInfo.getIsApp() == null) { if(leaseApplyInfo.getIsApp() == null) {
if (taskStatus != null) { if (taskStatus != null) {
// 如果taskStatus为3，则查询list中状态为1和3的数据
if (taskStatus.equals(3)) {
list = list.stream()
.filter(item -> item.getTaskStatus().equals(1) || item.getTaskStatus().equals(3))
.collect(Collectors.toList());
} else {
list = list.stream() list = list.stream()
.filter(item -> item.getTaskStatus().equals(taskStatus)) .filter(item -> item.getTaskStatus().equals(taskStatus))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} }
}
} }
return list; return list;

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

@ -392,6 +392,7 @@
case tt.task_status case tt.task_status
when 0 then '待审核' when 0 then '待审核'
when 6 then '审核中' when 6 then '审核中'
when 1 then '已完成'
when 3 then '已完成' when 3 then '已完成'
when 2 then '已驳回' when 2 then '已驳回'
when 5 then '待提交' when 5 then '待提交'