临时提交

16639036659

2024-06-17 d76c23793f13886f06941228b846690b74e58948

 src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java

@@ -1,5 +1,6 @@
package com.ruoyi.project.tr.specialCheck.controller;

import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
import com.ruoyi.doublePrevention.vo.ResultVO;
@@ -49,12 +50,17 @@



    @GetMapping()
    public String selectTbBaseCheckTaskPage(ModelMap mmap)
//    @GetMapping()
//    public String selectTbBaseCheckTaskPage(ModelMap mmap)
//    {
//        return prefix + "/specialCheckItemDangerLog";
//    }
    @GetMapping("{id}")
    public String specialCheckItemDangerLog(@PathVariable("id")String id,ModelMap modelMap)
    {
        modelMap.put("id",id);
        return prefix + "/specialCheckItemDangerLog";
    }



    @PostMapping("/list")
@@ -65,14 +71,6 @@
        ResultVO<List<TbSpecialCheckItemDangerLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
        List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData();

        List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
        for (TbSpecialCheckItemDangerLogDTO log : data) {
            for (PreventCJReportDangerInfo danger : dangerList) {
                if (danger.getId().equals(log.getDangerId())){
                    log.setDangerName(danger.getDangerName());
                }
            }
        }

        TableDataInfo dataTable = getDataTable(data);
        dataTable.setTotal(resultVO.getCount());