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 | 13 +++++++++++++
1 files changed, 13 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 fbc52ca..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
@@ -4,6 +4,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -53,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);
}
@@ -118,6 +127,10 @@
public String detailDangerAccept(@PathVariable("id") Long id, ModelMap mmap) {
//隐患排查实体
HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
+ PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(hiddenDangerCheckPoint.getId());
+ if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){
+ hiddenDangerCheckPoint.setReportTime(dangerInfo.getReportTime());
+ }
mmap.put("hdcp", hiddenDangerCheckPoint);
return prefix + "/detailDangerAccept";
}
--
Gitblit v1.9.2