From 6a073c2adf0cf393c6c7099d39c13dda892ff5e2 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 21 三月 2024 09:39:48 +0800
Subject: [PATCH] 添加防范措施字段
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
index 5c4ad1e..8902ae7 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
@@ -197,6 +197,10 @@
export.setExamineUserName(hcp.getExamineUserName());
}
+ export.setRegisterUserName(hcp.getRegisterUserName());
+ if (ObjectUtils.isNotEmpty(hcp.getRegisterCreateTime())){
+ export.setRegisterCreateTime1(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRegisterCreateTime()));
+ }
}
exportList.add(export);
}
@@ -445,7 +449,7 @@
}
startPage();
- List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
+ List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointListNewCount(hiddenDangerCheckPoint);
for (HiddenDangerCheckPoint dangerCheckPoint : list) {
PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(dangerCheckPoint.getId());
if (ObjectUtils.isNotEmpty(dangerInfo)){
--
Gitblit v1.9.2