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

16639036659

2022-10-31 9eaf260bb0368eea783b0ff0dd4ba7375c79e0f4

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

 src/main/java/com/ruoyi/doublePrevention/service/RiskService.java

@@ -172,4 +172,8 @@
     * 通过排查点，查找管控措施id

     */

    PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId);

    /**

     * 查询管控措施信息

     */

    PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId);

}


 src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java

@@ -8,10 +8,8 @@
import com.ruoyi.doublePrevention.entity.*;

import com.ruoyi.doublePrevention.entity.dto.req.*;

import com.ruoyi.doublePrevention.entity.dto.resp.*;

import com.ruoyi.doublePrevention.enums.ErrorCodes;

import com.ruoyi.doublePrevention.enums.ResultCodes;

import com.ruoyi.doublePrevention.enums.StatusEnum;

import com.ruoyi.doublePrevention.enums.SyncEnum;

import com.ruoyi.doublePrevention.enums.*;

import com.ruoyi.doublePrevention.exception.AusinessException;

import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;

import com.ruoyi.doublePrevention.service.RiskService;

import com.ruoyi.doublePrevention.service.baseService.*;

@@ -1305,6 +1303,19 @@
    public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {

        return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);

    }

    /**

     * 查询管控措施信息

     */

    @Override

    public PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId) {



        PreventRiskCheckUnit unitByBaseCheckPointId = preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);

//        if (ObjectUtils.isEmpty(unitByBaseCheckPointId)){

//            throw new AusinessException(E.DATA_DATABASE_DUPLICATED, "数据不存在或已被删除");

//        }

        return riskControlMeasureService.getPreventRiskControlMeasureById(unitByBaseCheckPointId.getControlMeasureId());

    }





    //    /**

//     * 全流程隐患上报-附属表信息插入


 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";
    }

 src/main/java/com/ruoyi/project/tr/baseCheckPoint/domain/BaseCheckPoint.java

@@ -46,6 +46,75 @@
    @Excel(name = "措施id")
    private Long controlMeasureId;

    /**controlMeasureCode */
    @Transient
    private String controlMeasureCode;

    /**措施Desc */
    @Transient
    private String measureDesc;

    @Transient
    private Integer classify1;

    @Transient
    private Integer classify2;

    @Transient
    private String classify3;

    @Transient
    private String riskCheckContent;


    public String getControlMeasureCode() {
        return controlMeasureCode;
    }

    public void setControlMeasureCode(String controlMeasureCode) {
        this.controlMeasureCode = controlMeasureCode;
    }

    public String getMeasureDesc() {
        return measureDesc;
    }

    public void setMeasureDesc(String measureDesc) {
        this.measureDesc = measureDesc;
    }

    public Integer getClassify1() {
        return classify1;
    }

    public void setClassify1(Integer classify1) {
        this.classify1 = classify1;
    }

    public Integer getClassify2() {
        return classify2;
    }

    public void setClassify2(Integer classify2) {
        this.classify2 = classify2;
    }

    public String getClassify3() {
        return classify3;
    }

    public void setClassify3(String classify3) {
        this.classify3 = classify3;
    }

    public String getRiskCheckContent() {
        return riskCheckContent;
    }

    public void setRiskCheckContent(String riskCheckContent) {
        this.riskCheckContent = riskCheckContent;
    }

    public Long getControlMeasureId() {
        return controlMeasureId;
    }