From d18dde2957a5cf877e48847a98e75a5d5ce66201 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期一, 17 六月 2024 09:25:31 +0800 Subject: [PATCH] 临时提交 --- src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java index aaff7cf..7337210 100644 --- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java +++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java @@ -64,6 +64,16 @@ ResultVO<List<TbSpecialCheckItemDangerLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO); List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData(); + + List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask(); + for (TbSpecialCheckItemDangerLogDTO log : data) { + for (PreventCJReportDangerInfo danger : dangerList) { + if (danger.getId().equals(log.getDangerId())){ + log.setDangerName(danger.getDangerName()); + } + } + } + TableDataInfo dataTable = getDataTable(data); dataTable.setTotal(resultVO.getCount()); -- Gitblit v1.9.2