添加

马宇豪

2024-06-19 b2f311d02b4ce8a1dc11a782f97297b1e1fbd28b

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

@@ -121,8 +121,8 @@
        }
    }

    @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);
@@ -136,6 +136,10 @@
        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();
@@ -143,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";
    }

    /**