From 0ed7a55d2bff4e6bd0aa999c76c6fd0e7379d602 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期五, 01 十二月 2023 16:45:26 +0800 Subject: [PATCH] 临时提交 --- src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java index 106580f..25a4c22 100644 --- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java +++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java @@ -54,6 +54,14 @@ startPage(); hiddenDangerCheckPoint.setAcceptUserId(getSysUser().getUserId());//验收人为本登录帐号userId的 List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint); + for (HiddenDangerCheckPoint dangerCheckPoint : list) { + PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(dangerCheckPoint.getId()); + if (ObjectUtils.isNotEmpty(dangerInfo)){ + if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){ + dangerCheckPoint.setReportTime(dangerInfo.getReportTime()); + } + } + } return getDataTable(list); } -- Gitblit v1.9.2