检查点查询添加管控措施ID

16639036659

2022-10-31 a72ac436263a8f41dd85635153dfdf204ae6eaa0

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

@@ -803,7 +803,7 @@
    @Override

    public int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob) {



        String jobUuid = UUID.randomUUID().toString();



        PreventRiskJobAndMeasure jobAndMeasure = new PreventRiskJobAndMeasure();



        //根据RiskId查询对应的管控措施

@@ -811,6 +811,7 @@


        //遍历管控措施集合

        for (PreventRiskCheckUnit checkUnit : unitByRiskId) {

            String jobUuid = UUID.randomUUID().toString();

            PreventRiskControlMeasure preventRiskControlMeasureById = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());

            //封装数据

            jobAndMeasure.setJobId(jobId);

@@ -944,7 +945,7 @@
        PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();



        dangerCheck.setUuid(dangerCheckUuid);

        dangerCheck.setCheckStatus(null);

        dangerCheck.setCheckStatus(null);//

        dangerCheck.setCheckId(checkId);

        dangerCheck.setJobId(hdc.getJobId());

        //获取上报主配置信息

@@ -1024,6 +1025,7 @@
                return StatusEnum.EXEC_FAIL.getCode();

            }

        }



        //2、删除核查任务-检查点的附属表----老代码未删除检查点信息，此处暂不做处理



        return StatusEnum.EXEC_SUCCESS.getCode();

@@ -1296,8 +1298,15 @@
        ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);

        return resultVO;

    }

    /**

     * 通过排查点，查找管控措施id

     */

    @Override

    public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {

        return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);

    }



//    /**

    //    /**

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

//     * */

//    @Override