关闭数据上报

16639036659

2022-10-31 b2d4a01146b2e24a7e295565c22238041cb261f2

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

@@ -164,11 +164,11 @@
            resultVO.setMsg("安全风险分析单元名称不能为空");

            return resultVO;

        }

        PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);

        if (riskUnit == null){

            resultVO.setMsg("安全风险分析单元名称不存在");

            return resultVO;

        }

//        PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);

//        if (riskUnit == null){

//            resultVO.setMsg("安全风险分析单元名称不存在");

//            return resultVO;

//        }

        if (StringUtils.isEmpty(riskEventName)){

            resultVO.setMsg("安全风险事件名称不能为空");

            return resultVO;

@@ -190,7 +190,7 @@
        riskEvent.setEventResult(eventResult);

        riskEvent.setRiskEventName(riskEventName);

        riskEvent.setRiskUnitId(riskUnitId);

        riskEvent.setRiskUnitUuid(riskUnit.getRiskUnitUuid());

//        riskEvent.setRiskUnitUuid(riskUnit.getRiskUnitUuid());

        riskEvent.setDeleteStatus(StatusEnum.DELETE_STATUS_USE.getCode());

        riskEvent.setGmtCreate(date);

        riskEvent.setGmtModitify(date);

@@ -701,7 +701,7 @@
        Long riskEventId = measureQueryReqDTO.getRiskEventId();



        Page<PreventRiskControlMeasure> page = PageHelper.startPage(pageIndex, pageSize);

        riskControlMeasureService.listRiskEvenByCondition(controlType,riskEventId);

        riskControlMeasureService.listRiskControlMeasureByCondition(controlType,riskEventId);



        List<PreventRiskControlMeasure> result = page.getResult();

        Long total = page.getTotal();

@@ -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();

@@ -1276,6 +1278,27 @@
        return listQueryRespDTOs;

    }





    /**

     * 管控措施-不分页查询

     */

    @Override

    public ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure() {



        List<PreventRiskControlMeasure> controlMeasures = riskControlMeasureService.listRiskControlMeasure();

        List<PreventRiskControlMeasureListQueryRespDTO> pageResult = null;

        if (controlMeasures != null) {

            pageResult = controlMeasures.stream().map((preventRiskControlMeasure) -> {

                PreventRiskControlMeasureListQueryRespDTO dto = new PreventRiskControlMeasureListQueryRespDTO();

                BeanUtils.copyProperties(preventRiskControlMeasure, dto);

                return dto;

            }).collect(Collectors.toList());

        }



        ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);

        return resultVO;

    }



//    /**

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

//     * */