From f20c5d54d08cf748d5009f1833a5155e22f76a25 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Tue, 18 Mar 2025 18:19:37 +0800
Subject: [PATCH] =?UTF-8?q?app=E9=A2=86=E7=94=A8=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../lease/service/impl/LeaseTaskServiceImpl.java | 11 +++++++----
.../mapper/material/lease/LeaseTaskMapper.xml | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
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 71e36e15..cf5cddc0 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
@@ -208,11 +208,14 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
.filter(item -> containsKeyword(item, keyWord))
.collect(Collectors.toList());
}
- if (taskStatus != null) {
- list = list.stream()
- .filter(item -> item.getTaskStatus().equals(taskStatus))
- .collect(Collectors.toList());
+ if(leaseApplyInfo.getIsApp()==null){
+ if (taskStatus != null) {
+ list = list.stream()
+ .filter(item -> item.getTaskStatus().equals(taskStatus))
+ .collect(Collectors.toList());
+ }
}
+
}
return list;
}
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 8cdc578f..de71797c 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
@@ -448,8 +448,8 @@
and lai.cost_bearing_party =
#{costBearingParty}
- and (tt.task_status = 0 or tt.task_status = 1 or tt.task_status = 2)
- and (tt.task_status = 3 or tt.task_status = 4)
+ and (tt.task_status = 0 or tt.task_status = 6)
+ and (tt.task_status = 1 )
GROUP BY lai.id
ORDER BY tt.task_status,tt.create_time desc