From bc1e19dd5e324a729b395f63408ac29d3854ccfc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 04 三月 2026 14:27:18 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 4 ++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java | 19 +++++++++----------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
index 10f4271..0d75e46 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
@@ -250,8 +250,8 @@
@ApiOperation(value = "获取检查资料列表")
@GetMapping("/getDeviceDetailCheckPlanList")
- public R<List<Check>> getDeviceDetailCheckPlanList(@RequestParam Integer planId) {
- List<Check> list = checkService.list(new LambdaQueryWrapper<Check>().eq(Check::getPlanId,planId).orderByDesc(Check::getTime));
+ public R<List<Check>> getDeviceDetailCheckPlanList(@RequestParam Integer planId,@RequestParam Integer projectId) {
+ List<Check> list = checkService.list(new LambdaQueryWrapper<Check>().eq(Check::getPlanId,planId).eq(projectId!=null,Check::getProjectId,projectId).orderByDesc(Check::getTime));
if(!list.isEmpty()){
List<Integer> planIds = list.stream().map(Check::getPlanId).toList();
List<Plan> plans = planService.listByIds(planIds);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
index 0b036f9..f6cdd43 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
@@ -280,17 +280,16 @@
riskLevel = "A类";
}
}
-
- List<Task> tasks = taskMap.get(deviceListVo.getId());
+ List<Task> tasks = taskList.stream().filter(e -> e.getProjectId().equals(deviceListVo.getId())).toList();
+// List<Task> tasks = taskMap.get(deviceListVo.getId());
if (tasks != null && !tasks.isEmpty()) {
- List<Integer> taskIds = tasks.stream().map(Task::getId).toList();
- List<Record> recordList = records.stream().filter(e -> taskIds.contains(e.getCheckTaskId())).toList();
- Record record = recordList.stream().max(Comparator.comparing(Record::getCreateTime)).orElse(null);
- if (record != null) {
- Task task = taskRecordMap.get(record.getCheckTaskId());
- if (task != null) {
- deviceListVo.setCheckTime(task.getCreateTime());
- }
+
+ Task task1 = tasks.stream().filter(e -> e.getDate().getYear() == LocalDateTime.now().getYear() && e.getDate().getMonth().getValue() == LocalDateTime.now().getMonth().getValue()).findFirst().orElse(null);
+
+// List<Record> recordList = records.stream().filter(e -> taskIds.contains(e.getCheckTaskId())).toList();
+// Record record = recordList.stream().max(Comparator.comparing(Record::getCreateTime)).orElse(null);
+ if (task1 != null) {
+ deviceListVo.setCheckTime(task1.getDate().atStartOfDay());
deviceListVo.setCheckResult("已检查");
} else {
deviceListVo.setCheckTime(null);
--
Gitblit v1.7.1