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/EntrustProjectController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
index 1982458..6c39039 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
@@ -17,9 +17,11 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@RestController
@RequestMapping("/projectEntrust")
@@ -54,6 +56,21 @@
@Autowired
private UserFileService userFileService;
+ @ApiOperation(value = "项目不分页列表", response = Project.class)
+ @GetMapping("/projectListAll")
+ public R<List<Project>> projectListAll(Integer clientId,Integer category) {
+ LambdaQueryWrapper<Project> projectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ projectLambdaQueryWrapper.eq(Project::getClientId, clientId)
+ .eq(Project::getDeleted, false);
+ if (category==1){
+ projectLambdaQueryWrapper.eq(Project::getStatus, 1);
+ }
+ if (category==2){
+ projectLambdaQueryWrapper.eq(Project::getType,2);
+ }
+ List<Project> list = projectService.list(projectLambdaQueryWrapper);
+ return R.ok(list);
+ }
@ApiOperation(value = "项目列表", response = EntrustProjectVo.class)
@PostMapping("/projectList")
public R<Page<EntrustProjectVo>> projectList(@RequestBody EntrustListQuery query) {
@@ -104,9 +121,10 @@
@ApiOperation(value = "获取重大隐患列表", response = DeviceListVo.class)
@PostMapping("/errorList")
- public R<Page<ErrorListVo>> errorList(@RequestBody @Valid ErrorListQuery query) {
+ public R<Page<ErrorListVo>> errorList(@RequestBody @Valid ErrorListQuery query) throws ParseException {
Page<ErrorListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
List<ErrorListVo> list = deviceUsageService.errorList(page, query);
+
for (ErrorListVo errorListVo : list) {
List<Integer> recordFileIds = recordImageService.lambdaQuery()
.eq(RecordImage::getRecordId, errorListVo.getId()).list()
@@ -162,7 +180,7 @@
Record record = recordService.getById(id);
Integer problemId = record.getProblemId();
var res = recordService.getHiddenDangerDetail(problemId);
- return R.ok(record);
+ return R.ok(res);
}
@ApiOperation(value = "获取隐患详情")
@GetMapping("/getHiddenDangerDetail/{problemId}")
@@ -183,4 +201,5 @@
+
}
--
Gitblit v1.7.1