添加

马宇豪

2024-06-19 b2f311d02b4ce8a1dc11a782f97297b1e1fbd28b

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

@@ -22,6 +22,9 @@
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;

import java.sql.Date;
import java.time.Instant;
import java.time.ZoneId;
import java.util.List;

/**
@@ -63,8 +66,24 @@
    {

        ResultVO<List<TbSpecialCheckScoreAndDangerLog>> resultVO = scoreAndDangerDangerLogService.selectSpecialCheckScoreAndDangerLogPage(scoreAndDangerLogBO);

        List<TbSpecialCheckScoreAndDangerLogRespDTO> data = (List<TbSpecialCheckScoreAndDangerLogRespDTO>) resultVO.getData();
        List<TbSpecialCheckScoreAndDangerLog> scoreList = (List<TbSpecialCheckScoreAndDangerLog>) resultVO.getData();
        List<TbSpecialCheckScoreAndDangerLogDTO> tbSpecialCheckScoreAndDangerLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckScoreAndDangerLogDTO.class);
        for (TbSpecialCheckScoreAndDangerLogDTO score : tbSpecialCheckScoreAndDangerLogDTOS) {
            for (TbSpecialCheckScoreAndDangerLog datum : scoreList) {
                if (datum.getId().equals(score.getId())){
                    Instant checkDate = datum.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
                    score.setCheckDate(Date.from(checkDate));

                    Instant createDate = datum.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
                    score.setCreateDate(Date.from(createDate));

                    Instant updateDate = datum.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
                    score.setUpdateDate(Date.from(updateDate));
                }
            }
        }

        TableDataInfo dataTable = getDataTable(tbSpecialCheckScoreAndDangerLogDTOS);
        dataTable.setTotal(resultVO.getCount());
@@ -102,13 +121,25 @@
        }
    }

    @GetMapping("/edit/{id}")
    public String edit(@PathVariable("id") Long indexId, ModelMap mmap)
    @GetMapping("/edit/{indexId}")
    public String edit(@PathVariable("indexId") Long indexId, ModelMap mmap)
    {
        TbSpecialCheckScoreAndDangerLog specialCheckItem = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogByIndexId(indexId);
        TbSpecialCheckScoreAndDangerLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckScoreAndDangerLogDTO.class);

        Instant checkDate = specialCheckItem.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
        data.setCheckDate(Date.from(checkDate));

        Instant createDate = specialCheckItem.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
        data.setCreateDate(Date.from(createDate));

        Instant updateDate = specialCheckItem.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
        data.setUpdateDate(Date.from(updateDate));
        mmap.put("specialCheckItem",data);
        List<RiskList> riskList = riskListService.listHazardSource();
        List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
        mmap.put("hazardList", riskList);
        mmap.put("dangerList", dangerList);
//        TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
//        ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
//        Object data = listResultVO.getData();
@@ -116,17 +147,31 @@
        return prefix + "/edit";
    }

    @GetMapping("/detail/{id}")
    public String detail(@PathVariable("id") Long indexId, ModelMap mmap)
    @GetMapping("/detail/{indexId}")
    public String detail(@PathVariable("indexId") Long indexId, ModelMap mmap)
    {
        TbSpecialCheckScoreAndDangerLog specialCheckItem = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogByIndexId(indexId);
        mmap.put("specialCheckItem",specialCheckItem);
        TbSpecialCheckScoreAndDangerLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckScoreAndDangerLogDTO.class);

        Instant checkDate = specialCheckItem.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
        data.setCheckDate(Date.from(checkDate));

        Instant createDate = specialCheckItem.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
        data.setCreateDate(Date.from(createDate));

        Instant updateDate = specialCheckItem.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
        data.setUpdateDate(Date.from(updateDate));
        mmap.put("specialCheckItem",data);
        List<RiskList> riskList = riskListService.listHazardSource();
        List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
        mmap.put("hazardList", riskList);
        mmap.put("dangerList", dangerList);

//        TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
//        ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
//        Object data = listResultVO.getData();
//        mmap.put("tbBaseCheckTask", data);
        return prefix + "/edit";
        return prefix + "/detail";
    }

    /**