修复问题

heheng

2025-06-27 5746e59e622daa8ce62d0c29aaba9b8bd5308bcd

 src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java

@@ -8,9 +8,13 @@
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.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;
@@ -81,6 +85,23 @@
    {
        startPage();
        List<BaseCheckPoint> list = baseCheckPointService.selectBaseCheckPointList(baseCheckPoint);
        List<BaseCheckPoint> resultList = new ArrayList<>();

        //todo-2022 ，此处改造，查询措施相关信息
        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(list);
    }

@@ -145,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";
    }
@@ -165,12 +188,18 @@

        //todo-2022 ，此处改造，嵌入管控措施
        baseCheckPoint.getCheckPointId();

        //使用baseCheckPointId进行查询
//        BaseCheckPoint baseCheckPointById = baseCheckPointService.getBaseCheckPointById(baseCheckPoint.getCheckPointId());

        PreventPointAndMeasureParams pointAndMeasureParams = new PreventPointAndMeasureParams();
        //封装参数
        pointAndMeasureParams.setBaseCheckPointId(baseCheckPoint.getCheckPointId());
        pointAndMeasureParams.setControlMeasureId(baseCheckPoint.getControlMeasureId());// todo，该参数页面尚未封装进去
        pointAndMeasureParams.setRiskId(baseCheckPoint.getRiskId());

        int result1 = riskService.insertPointAndMeasure(pointAndMeasureParams);

        if (result1 < 1){
            throw new RuntimeException("新增异常，保存管控措施关系失败");
        }
@@ -184,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";
    }