延期整改

马宇豪

2023-08-25 aa2051a2327c079105110f5424f3a44ffaa0c7bb

 src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java

@@ -225,7 +225,7 @@
        mmap.put("riskList", riskList);
        //查询风险清单类型
        List<RiskType> riskTypes = getRiskTypes(riskList.getRiskType());
        mmap.put("  ", riskTypes);
        mmap.put("riskTypes", riskTypes);
        //判断如果是作业活动，查询作业活动频率
        if (riskList.getRiskType() == 2) {
            List riskTypes1 = getRiskTypes(4);
@@ -444,20 +444,20 @@
        List<RiskList> riskLists = riskListService.selectRiskListList(riskList);

        List<PreventRiskCheckUnitRespDTO> list = new ArrayList<>();
        //todo-2022 新代码，使用DTO,封装进去措施数据
        for (RiskList risk : riskLists) {
            PreventRiskCheckUnitRespDTO respDTO = BeanCopyUtils.copyBean(risk, PreventRiskCheckUnitRespDTO.class);
        //todo-2022 新代码，使用DTO,封装进去措施数据 --暂时不使用
//        for (RiskList risk : riskLists) {
//            PreventRiskCheckUnitRespDTO respDTO = BeanCopyUtils.copyBean(risk, PreventRiskCheckUnitRespDTO.class);
//
//            //查询封装管控措施
//            List<PreventRiskControlMeasure> riskControlMeasureList = riskService.getRiskControlMeasureByRiskId(risk.getRiskListId());
//            if (riskControlMeasureList != null && riskControlMeasureList.size() > 1){
//                respDTO.setRiskControlMeasures(riskControlMeasureList);
//            }
//
//            list.add(respDTO);
//        }

            //查询封装管控措施
            List<PreventRiskControlMeasure> riskControlMeasureList = riskService.getRiskControlMeasureByRiskId(risk.getRiskListId());
            if (riskControlMeasureList != null && riskControlMeasureList.size() > 1){
                respDTO.setRiskControlMeasures(riskControlMeasureList);
            }

            list.add(respDTO);
        }

        return getDataTable(list);
        return getDataTable(riskLists);
    }