From f4f653b1f69eae7eee5249b9f41e43bdf3239aa1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 09 四月 2026 15:45:56 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 880acaa..615a59c 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
@@ -184,6 +184,23 @@
return R.ok(hiddenDangerVo);
}
+ @ApiOperation(value = "获取项目所有隐患数量",response = HiddenDangerVo.class)
+ @GetMapping("/getProjectHiddenDangerCountAll/{id}")
+ public R<HiddenDangerVo> getProjectHiddenDangerCountAll(@PathVariable Integer id) {
+ HiddenDangerVo hiddenDangerVo = new HiddenDangerVo();
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, id));
+ if(!list.isEmpty()){
+ List<Integer> taskIds = list.stream().map(Task::getId).collect(Collectors.toList());
+ // 0是一级隐患
+ List<Record> records = recordService.list(new LambdaQueryWrapper<Record>().eq(Record::getDeleted, 0).in(Record::getCheckTaskId, taskIds));
+ hiddenDangerVo.setSerious(records.size());
+ int rectified = records.stream().filter(Record::getReformed).collect(Collectors.toList()).size();
+ hiddenDangerVo.setRectified(rectified);
+ hiddenDangerVo.setUnRectified(records.size()-rectified);
+ }
+ return R.ok(hiddenDangerVo);
+ }
+
@ApiOperation(value = "获取设备数量",response = DeviceCountVo.class)
@GetMapping("/getProjectDeviceCount/{id}")
public R<List<DeviceCountVo>> getProjectDeviceCount(@PathVariable Integer id) {
--
Gitblit v1.7.1