From 3f2f6df1e2b5be220b379348c3c0594a00133857 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 01 七月 2025 16:54:21 +0800
Subject: [PATCH] 工作台
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
index 4367fa7..2a923e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
@@ -553,7 +553,7 @@
for (TTask task : list) {
TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null);
if(Objects.nonNull(tTaskDetail)){
- if(tTaskDetail.getClearStatus() == 2){
+ if(Objects.nonNull(tTaskDetail.getClearStatus()) && tTaskDetail.getClearStatus() == 2){
result.add(task);
}
}
@@ -621,7 +621,7 @@
for (TTask task : list) {
TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null);
if(Objects.nonNull(tTaskDetail)){
- if(tTaskDetail.getClearStatus() == 2){
+ if(Objects.nonNull(tTaskDetail.getClearStatus()) && tTaskDetail.getClearStatus() == 2){
result.add(task);
}
}
@@ -827,10 +827,14 @@
for (TTask task : list) {
TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null);
if(Objects.nonNull(tTaskDetail)){
- if(tTaskDetail.getClearStatus() == 2){
- unqualifiedWarn++;
+ if(Objects.nonNull(tTaskDetail.getClearStatus())){
+ if(tTaskDetail.getClearStatus() == 2){
+ unqualifiedWarn++;
+ }else {
+ qualifiedWarn++;
+ }
}else {
- qualifiedWarn++;
+ unqualifiedWarn++;
}
}
}
@@ -889,10 +893,14 @@
for (TTask task : list) {
TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null);
if(Objects.nonNull(tTaskDetail)){
- if(tTaskDetail.getClearStatus() == 2){
- unqualifiedWarn++;
+ if(Objects.nonNull(tTaskDetail.getClearStatus())){
+ if(tTaskDetail.getClearStatus() == 2){
+ unqualifiedWarn++;
+ }else {
+ qualifiedWarn++;
+ }
}else {
- qualifiedWarn++;
+ unqualifiedWarn++;
}
}
}
--
Gitblit v1.7.1