From 58b0713d68fa8fef72a39c1ea6102dd36a4d2a9c Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 19 九月 2022 10:40:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 4b1431c..2ed839c 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
@@ -8,6 +8,9 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
+import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
+import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.project.enumerate.TrEvaluationMethodDetailsEnum;
import com.ruoyi.project.enumerate.TrEvaluationMethodTypeEnum;
import com.ruoyi.project.system.dept.domain.Dept;
@@ -58,6 +61,9 @@
@Autowired
private IUserService userService;
+
+ @Autowired
+ private RiskService riskService;
@GetMapping("{riskId}")
public String baseCheckPoint(@PathVariable("riskId")Long riskId,ModelMap modelMap)
@@ -153,7 +159,19 @@
@ResponseBody
public AjaxResult addSave(BaseCheckPoint baseCheckPoint)
{
- return toAjax(baseCheckPointService.insertBaseCheckPoint(baseCheckPoint));
+ //老代码改造
+ int result = baseCheckPointService.insertBaseCheckPoint(baseCheckPoint);
+
+ //todo ，此处改造，嵌入管控措施
+ baseCheckPoint.getCheckPointId();
+ PreventPointAndMeasureParams pointAndMeasureParams = new PreventPointAndMeasureParams();
+ //封装参数
+ pointAndMeasureParams.setBaseCheckPointId(baseCheckPoint.getCheckPointId());
+ pointAndMeasureParams.setControlMeasureId(baseCheckPoint.getControlMeasureId());//todo，该参数页面尚未封装进去
+ pointAndMeasureParams.setRiskId(baseCheckPoint.getRiskId());
+ riskService.insertPointAndMeasure(pointAndMeasureParams);
+
+ return toAjax(result);
}
/**
@@ -163,6 +181,12 @@
public String edit(@PathVariable("checkPointId") Long checkPointId, ModelMap mmap)
{
BaseCheckPoint baseCheckPoint = baseCheckPointService.selectBaseCheckPointById(checkPointId);
+ //todo-2022 返回参数加入措施id
+ PreventRiskCheckUnit riskCheckUnit = riskService.getRiskUnitByBaseCheckPointId(checkPointId);
+
+ if (riskCheckUnit != null){
+ baseCheckPoint.setControlMeasureId(riskCheckUnit.getControlMeasureId());
+ }
mmap.put("baseCheckPoint", baseCheckPoint);
return prefix + "/edit";
}
--
Gitblit v1.9.2