暂时提交

16639036659

2023-12-11 56c84cd7fb04407536eb0135162313029828a81f

 src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java

@@ -6,6 +6,8 @@
import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO;

import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasureRespDTO;

import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventListQueryRespDTO;

import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO;

import com.ruoyi.doublePrevention.service.RiskService;

import com.ruoyi.doublePrevention.service.baseService.PreventOverhaulLogService;

import com.ruoyi.doublePrevention.vo.ResultVO;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

@@ -32,15 +34,28 @@
    @Autowired

    private PreventOverhaulLogService overhaulLogService;



    @Autowired

    private RiskService riskService;





//    @GetMapping()

//    public String overhaulLog()

//    {

//        return prefix + "/overhaulLog";

//    }

    @GetMapping()

    public String overhaulLog()

    public String overhaulLog(ModelMap mmap)

    {

        List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();

        mmap.put("riskUnits", respDTOS);

        return prefix + "/overhaulLog";

    }



    /**

     * 查询

     * */

    @PostMapping("/list")

    @ResponseBody

    public TableDataInfo selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO, ModelMap mmap){



        ResultVO<PreventOverhaulLogRespDTO> result = overhaulLogService.selectOverhaulLogPage(overhaulLogReqBO);

@@ -54,12 +69,19 @@
    /**

     * 新增检修记录

     */

//    @GetMapping("/add")

//    public String add()

//    {

//        return prefix + "/add";

//    }



    @GetMapping("/add")

    public String add()

    public String add(ModelMap mmap)

    {

        List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();

        mmap.put("riskUnits", respDTOS);

        return prefix + "/add";

    }





    /**

     * 新增保存检修记录

@@ -85,7 +107,9 @@
    public String edit(@PathVariable("id") Long id, ModelMap mmap)

    {

        PreventOverhaulLog overhaulLogById = overhaulLogService.getOverhaulLogById(id);

        mmap.put("overhaulLogById",overhaulLogById);

        mmap.put("overhaulLog",overhaulLogById);

        List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();

        mmap.put("riskUnits", respDTOS);

        return prefix + "/edit";

    }