From b39c76514b9e526739bb07f8b01298b8ab76654c Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Wed, 26 Jul 2023 16:46:13 +0800
Subject: [PATCH] bug

---
 .../java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java   | 9 +++++++++
 src/main/java/com/iflytop/nuclear/vo/TaskVO.java                 | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java
index a4ce347..9f5145a 100644
--- a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java
@@ -53,6 +53,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             if (nuclearCoreConfigList.size() > 0) {
                 canUpload = false;
             }
+            // 需要判断有无错误检测项，如果有则进行标记
+            boolean hasError = false;
+            QueryWrapper<NuclearCoreConfig> nuclearCoreConfigQueryWrapper2 = new QueryWrapper<>();
+            nuclearCoreConfigQueryWrapper2.eq("task_id", task.getId()).eq("result", 2);
+            List<NuclearCoreConfig> nuclearCoreConfigList2 = nuclearCoreConfigService.list(nuclearCoreConfigQueryWrapper2);
+            if (nuclearCoreConfigList2.size() > 0) {
+                hasError = true;
+            }
             Long nuclearStationId = task.getNuclearStationId();
             Long nuclearCoreId = task.getNuclearCoreId();
             NuclearCore nuclearCore = nuclearCoreService.getById(nuclearCoreId);
@@ -73,6 +81,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 .startTime(task.getStartTime())
                 .endTime(task.getEndTime())
                 .canUpload(canUpload)
+                    .hasError(hasError)
                 .build();
             result.add(taskVO);
         }
diff --git a/src/main/java/com/iflytop/nuclear/vo/TaskVO.java b/src/main/java/com/iflytop/nuclear/vo/TaskVO.java
index 39009a9..9cafcf9 100644
--- a/src/main/java/com/iflytop/nuclear/vo/TaskVO.java
+++ b/src/main/java/com/iflytop/nuclear/vo/TaskVO.java
@@ -40,4 +40,5 @@ public class TaskVO {
     private Date endTime;
 
     private String currentCoord;
+    private boolean hasError;
 }