From 247a4a1f10f233c89a4bd054dee3cb9b7d4a76f1 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 19 十一月 2025 08:40:12 +0800
Subject: [PATCH] 新增数据上传准东
---
src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java b/src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java
index 3ac9fcb..e5b4a10 100644
--- a/src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java
+++ b/src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java
@@ -9,9 +9,12 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasureListQueryRespDTO;
+import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerInfoService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.enumerate.TrEvaluationMethodDetailsEnum;
import com.ruoyi.project.enumerate.TrEvaluationMethodTypeEnum;
import com.ruoyi.project.system.dept.domain.Dept;
@@ -88,10 +91,18 @@
for (BaseCheckPoint checkPoint : list) {
PreventRiskCheckUnit measureByCheckPointId = riskService.getRiskControlMeasureByCheckPointId(checkPoint.getCheckPointId());
checkPoint.setControlMeasureId(measureByCheckPointId.getControlMeasureId());
+ PreventRiskControlMeasure riskControlMeasureInfo = riskService.getRiskControlMeasureInfo(checkPoint.getCheckPointId());
+ checkPoint.setControlMeasureId(riskControlMeasureInfo.getId());
+ checkPoint.setControlMeasureCode(riskControlMeasureInfo.getControlMeasureCode());
+ checkPoint.setClassify1(Integer.valueOf(riskControlMeasureInfo.getClassify1()));
+ checkPoint.setClassify2(Integer.valueOf(riskControlMeasureInfo.getClassify2()));
+ checkPoint.setClassify3(riskControlMeasureInfo.getClassify3());
+ checkPoint.setMeasureDesc(riskControlMeasureInfo.getMeasureDesc());
+ checkPoint.setRiskCheckContent(riskControlMeasureInfo.getCheckContent());
resultList.add(checkPoint);
}
- return getDataTable(resultList);
+ return getDataTable(list);
}
/**
@@ -155,8 +166,10 @@
* 新增基础清单检查点
*/
@GetMapping("/add/{riskId}")
- public String add(@PathVariable("riskId")Long riskId ,ModelMap modelMap)
+ public String add(@PathVariable("riskId")Long riskId ,ModelMap modelMap, ModelMap mmap)
{
+ ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = riskService.listRiskControlMeasure();
+ mmap.put("measureList",resultVO.getData());
modelMap.put("riksId",riskId);
return prefix + "/add";
}
@@ -200,7 +213,22 @@
@GetMapping("/edit/{checkPointId}")
public String edit(@PathVariable("checkPointId") Long checkPointId, ModelMap mmap)
{
+ ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = riskService.listRiskControlMeasure();
+ mmap.put("measureList",resultVO.getData());
BaseCheckPoint baseCheckPoint = baseCheckPointService.selectBaseCheckPointById(checkPointId);
+
+ //todo-2022 ，此处改造，嵌入管控措施
+ PreventRiskControlMeasure riskControlMeasureInfo = riskService.getRiskControlMeasureInfo(baseCheckPoint.getCheckPointId());
+
+ baseCheckPoint.setControlMeasureId(riskControlMeasureInfo.getId());
+ baseCheckPoint.setControlMeasureCode(riskControlMeasureInfo.getControlMeasureCode());
+ baseCheckPoint.setClassify1(Integer.valueOf(riskControlMeasureInfo.getClassify1()));
+ baseCheckPoint.setClassify2(Integer.valueOf(riskControlMeasureInfo.getClassify2()));
+ baseCheckPoint.setClassify3(riskControlMeasureInfo.getClassify3());
+ baseCheckPoint.setMeasureDesc(riskControlMeasureInfo.getMeasureDesc());
+ baseCheckPoint.setRiskCheckContent(riskControlMeasureInfo.getCheckContent());
+
+
mmap.put("baseCheckPoint", baseCheckPoint);
return prefix + "/edit";
}
--
Gitblit v1.9.2