检查点查询添加管控措施信息

16639036659

2022-10-31 9eaf260bb0368eea783b0ff0dd4ba7375c79e0f4

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

@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
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;
@@ -88,6 +89,14 @@
        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);
        }

@@ -201,6 +210,19 @@
    public String edit(@PathVariable("checkPointId") Long checkPointId, ModelMap mmap)
    {
        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";
    }