双重预防项目-国泰新华二开定制版
huangzhen
2022-10-28 886a387463f4e0e0ad6f7c2a04d2cfab2e3aace8
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();
@@ -1276,6 +1276,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;
    }
//    /**
//     * 全流程隐患上报-附属表信息插入
//     * */