Merge remote-tracking branch 'origin/master'

16639036659

2024-06-18 a3888330dfc4df035753dd77ffeaf6155060b697

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

@@ -1,11 +1,14 @@
package com.ruoyi.project.tr.specialCheck.controller;

import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbBaseCheckScoreDTO;
import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -52,6 +55,19 @@
        return dataTable;
    }

    @GetMapping("/edit/{id}")
    public String edit(@PathVariable("id") Long indexId, ModelMap mmap)
    {
//        TbSpecialCheckItemDangerLog specialCheckItem = itemDangerLogService.getSpecialCheckItemDangerLogByIndexId(indexId);
//        mmap.put("specialCheckItem",specialCheckItem);

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

}