评分项内容拆分

16639036659

2024-06-18 4fb65d8e3c5fc8ddb8882a355cd31ecb9d51f3d9

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