From 3cde2386c1ddaeeacc8b815d25af3b6a84541e46 Mon Sep 17 00:00:00 2001
From: 换个名字嗨起来 <577530412@qq.com>
Date: 星期四, 25 七月 2024 15:58:48 +0800
Subject: [PATCH] 接收返回值，做空值判断
---
src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java b/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
index baa7454..b61f558 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
@@ -22,10 +22,7 @@
import com.ruoyi.project.tr.riskCheckPoint.service.IRiskCheckPointService;
import com.ruoyi.project.tr.riskEvaluationPlan.domain.RiskEvaluationPlan;
import com.ruoyi.project.tr.riskEvaluationPlan.service.IRiskEvaluationPlanService;
-import com.ruoyi.project.tr.riskList.domain.RiskList;
-import com.ruoyi.project.tr.riskList.domain.RiskListByCrafts;
-import com.ruoyi.project.tr.riskList.domain.RiskListByDevice;
-import com.ruoyi.project.tr.riskList.domain.RiskListByWork;
+import com.ruoyi.project.tr.riskList.domain.*;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import com.ruoyi.project.tr.riskType.domain.RiskType;
import com.ruoyi.project.tr.riskType.service.IRiskTypeService;
@@ -49,7 +46,6 @@
@RequestMapping("/tr/riskList")
public class RiskListController extends BaseController {
private String prefix = "tr/riskList";
-
@Autowired
@@ -103,7 +99,7 @@
}
/**
- * 查询风险清单列表
+ * 查询风险清单列表 todo-20240522-风险四色图
*/
@PostMapping("/list/{id}")
@ResponseBody
@@ -114,6 +110,20 @@
riskList.setCompanyId(sysUser.getCompanyId());
List<RiskList> list = riskListService.selectRiskListList(riskList);
+
+ if (riskList.getRiskType() == 5){
+ //获取所有风险评价计划
+ List<RiskList> allPlan = riskListService.getAllPlan();
+ for (RiskList risk : list) {
+ for (RiskList riskListOfPlan : allPlan) {
+ if (risk.getRiskListId().equals(riskListOfPlan.getRiskListId())){
+ risk.setEvaluationNowFengxianJibie(riskListOfPlan.getEvaluationNowFengxianJibie());
+ risk.setEvaluationNowFengxianse(riskListOfPlan.getEvaluationNowFengxianse());
+ risk.setEvaluationNowJibie(riskListOfPlan.getEvaluationNowJibie());
+ }
+ }
+ }
+ }
//判断是否是作业活动，如果是，则再次查询工作频率类型
if (id == 2) {
RiskType riskType = new RiskType();
--
Gitblit v1.9.2