From 9015e720487b737743232b0b3aa464c2ac9e8d17 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期五, 15 十一月 2024 17:31:24 +0800
Subject: [PATCH] 修改请求地址
---
src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 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 cf22fd3..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
@@ -6,6 +6,7 @@
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskCheckUnitRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -21,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;
@@ -48,6 +46,7 @@
@RequestMapping("/tr/riskList")
public class RiskListController extends BaseController {
private String prefix = "tr/riskList";
+
@Autowired
private IRiskListService riskListService;
@@ -100,7 +99,7 @@
}
/**
- * 查询风险清单列表
+ * 查询风险清单列表 todo-20240522-风险四色图
*/
@PostMapping("/list/{id}")
@ResponseBody
@@ -111,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();
@@ -441,20 +454,20 @@
List<RiskList> riskLists = riskListService.selectRiskListList(riskList);
List<PreventRiskCheckUnitRespDTO> list = new ArrayList<>();
- //todo-2022 新代码，使用DTO,封装进去措施数据
- for (RiskList risk : riskLists) {
- PreventRiskCheckUnitRespDTO respDTO = BeanCopyUtils.copyBean(risk, PreventRiskCheckUnitRespDTO.class);
+ //todo-2022 新代码，使用DTO,封装进去措施数据 --暂时不使用
+// for (RiskList risk : riskLists) {
+// PreventRiskCheckUnitRespDTO respDTO = BeanCopyUtils.copyBean(risk, PreventRiskCheckUnitRespDTO.class);
+//
+// //查询封装管控措施
+// List<PreventRiskControlMeasure> riskControlMeasureList = riskService.getRiskControlMeasureByRiskId(risk.getRiskListId());
+// if (riskControlMeasureList != null && riskControlMeasureList.size() > 1){
+// respDTO.setRiskControlMeasures(riskControlMeasureList);
+// }
+//
+// list.add(respDTO);
+// }
- //查询封装管控措施
- List<PreventRiskControlMeasure> riskControlMeasureList = riskService.getRiskControlMeasureByRiskId(risk.getRiskListId());
- if (riskControlMeasureList != null && riskControlMeasureList.size() > 1){
- respDTO.setRiskControlMeasures(riskControlMeasureList);
- }
-
- list.add(respDTO);
- }
-
- return getDataTable(list);
+ return getDataTable(riskLists);
}
--
Gitblit v1.9.2