From 16dc9b71a91fa8ca5bb85285a5d54cb3e28eb60f Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期二, 18 六月 2024 17:21:51 +0800 Subject: [PATCH] 时间处理 --- src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java index 29cebe8..c3d8c31 100644 --- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java +++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.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; @@ -10,6 +11,7 @@ import com.ruoyi.project.tr.riskList.service.IRiskListService; import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO; import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO; +import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogDTO; import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogRespDTO; import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog; import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog; @@ -31,7 +33,7 @@ @RequestMapping("/tr/TBSpecialCheckScoreAndDangerLog") public class TBSpecialCheckScoreAndDangerLogController extends BaseController { - private String prefix = "tr/specialCheckScoreAndDangerLog"; + private String prefix = "tr/TBSpecialCheckScoreAndDangerLog"; @Autowired private SpecialCheckScoreAndDangerDangerLogService scoreAndDangerDangerLogService; @@ -62,9 +64,9 @@ ResultVO<List<TbSpecialCheckScoreAndDangerLog>> resultVO = scoreAndDangerDangerLogService.selectSpecialCheckScoreAndDangerLogPage(scoreAndDangerLogBO); List<TbSpecialCheckScoreAndDangerLogRespDTO> data = (List<TbSpecialCheckScoreAndDangerLogRespDTO>) resultVO.getData(); + List<TbSpecialCheckScoreAndDangerLogDTO> tbSpecialCheckScoreAndDangerLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckScoreAndDangerLogDTO.class); - - TableDataInfo dataTable = getDataTable(data); + TableDataInfo dataTable = getDataTable(tbSpecialCheckScoreAndDangerLogDTOS); dataTable.setTotal(resultVO.getCount()); return dataTable; @@ -104,6 +106,20 @@ public String edit(@PathVariable("id") Long indexId, ModelMap mmap) { TbSpecialCheckScoreAndDangerLog specialCheckItem = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogByIndexId(indexId); + TbSpecialCheckScoreAndDangerLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckScoreAndDangerLogDTO.class); + + mmap.put("specialCheckItem",data); +// TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO(); +// ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO); +// Object data = listResultVO.getData(); +// mmap.put("tbBaseCheckTask", data); + return prefix + "/edit"; + } + + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") Long indexId, ModelMap mmap) + { + TbSpecialCheckScoreAndDangerLog specialCheckItem = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogByIndexId(indexId); mmap.put("specialCheckItem",specialCheckItem); // TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO(); -- Gitblit v1.9.2