|
@ -53,6 +53,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta |
|
|
if (nuclearCoreConfigList.size() > 0) { |
|
|
if (nuclearCoreConfigList.size() > 0) { |
|
|
canUpload = false; |
|
|
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 nuclearStationId = task.getNuclearStationId(); |
|
|
Long nuclearCoreId = task.getNuclearCoreId(); |
|
|
Long nuclearCoreId = task.getNuclearCoreId(); |
|
|
NuclearCore nuclearCore = nuclearCoreService.getById(nuclearCoreId); |
|
|
NuclearCore nuclearCore = nuclearCoreService.getById(nuclearCoreId); |
|
@ -73,6 +81,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta |
|
|
.startTime(task.getStartTime()) |
|
|
.startTime(task.getStartTime()) |
|
|
.endTime(task.getEndTime()) |
|
|
.endTime(task.getEndTime()) |
|
|
.canUpload(canUpload) |
|
|
.canUpload(canUpload) |
|
|
|
|
|
.hasError(hasError) |
|
|
.build(); |
|
|
.build(); |
|
|
result.add(taskVO); |
|
|
result.add(taskVO); |
|
|
} |
|
|
} |
|
|