场所评价，风险四色图信息提供

16639036659

2024-05-30 aecdefe2d7f9d116327d295c43e1d4ad1f4a813b

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

@@ -22,10 +22,7 @@
import com.ruoyi.project.tr.riskCheckPoint.service.IRiskCheckPointService;
import com.ruoyi.project.tr.riskEvaluationPlan.domain.RiskEvaluationPlan;
import com.ruoyi.project.tr.riskEvaluationPlan.service.IRiskEvaluationPlanService;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.domain.RiskListByCrafts;
import com.ruoyi.project.tr.riskList.domain.RiskListByDevice;
import com.ruoyi.project.tr.riskList.domain.RiskListByWork;
import com.ruoyi.project.tr.riskList.domain.*;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import com.ruoyi.project.tr.riskType.domain.RiskType;
import com.ruoyi.project.tr.riskType.service.IRiskTypeService;
@@ -49,7 +46,6 @@
@RequestMapping("/tr/riskList")
public class RiskListController extends BaseController {
    private String prefix = "tr/riskList";



    @Autowired
@@ -103,7 +99,7 @@
    }

    /**
     * 查询风险清单列表
     * 查询风险清单列表 todo-20240522-风险四色图
     */
    @PostMapping("/list/{id}")
    @ResponseBody
@@ -114,6 +110,20 @@
        riskList.setCompanyId(sysUser.getCompanyId());

        List<RiskList> list = riskListService.selectRiskListList(riskList);

        if (riskList.getRiskType() == 5){
            //获取所有风险评价计划
            List<RiskList> allPlan = riskListService.getAllPlan();
            for (RiskList risk : list) {
                for (RiskList riskListOfPlan : allPlan) {
                    if (risk.getRiskListId().equals(riskListOfPlan.getRiskListId())){
                        risk.setEvaluationNowFengxianJibie(riskListOfPlan.getEvaluationNowFengxianJibie());
                        risk.setEvaluationNowFengxianse(riskListOfPlan.getEvaluationNowFengxianse());
                        risk.setEvaluationNowJibie(riskListOfPlan.getEvaluationNowJibie());
                    }
                }
            }
        }
        //判断是否是作业活动，如果是，则再次查询工作频率类型
        if (id == 2) {
            RiskType riskType = new RiskType();
@@ -444,20 +454,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);
    }