From f2b1bc77167c21b02413d552d4e429183f8c6c83 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期五, 15 十二月 2023 10:58:39 +0800 Subject: [PATCH] 导出添加登记人信息 --- src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 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..a9ac804 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 @@ -46,7 +46,7 @@ } /** - * 查询隐患排查列表 + * 查询隐患排查列表头 todo */ @PostMapping("/list") @ResponseBody @@ -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