diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index cab57da6..32c3b0f8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -373,9 +373,16 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { if(leaseApplyInfo.getIsApp() == null) { if (taskStatus != null) { - list = list.stream() - .filter(item -> item.getTaskStatus().equals(taskStatus)) - .collect(Collectors.toList()); + // 如果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() + .filter(item -> item.getTaskStatus().equals(taskStatus)) + .collect(Collectors.toList()); + } } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml index 805eaf77..6c118f23 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml @@ -392,6 +392,7 @@ case tt.task_status when 0 then '待审核' when 6 then '审核中' + when 1 then '已完成' when 3 then '已完成' when 2 then '已驳回' when 5 then '待提交'