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/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java | 14 ++++++++------
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 4 ++++
2 files changed, 12 insertions(+), 6 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..56f0095 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);
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java
index aa4857b..9e572bc 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java
@@ -66,6 +66,13 @@
@Excel(name = "核查人")
private String examineUserName;
+ @Excel(name = "登记人员")
+ private String registerUserName;
+
+ @Excel(name = "登记时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String registerCreateTime1;
+
@@ -106,12 +113,7 @@
// @Excel(name = "整改状态")
// private String rectifyStatus;
//
-// @Excel(name = "隐患登记时间")
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-// private String registerCreateTime;
-//
-// @Excel(name = "登记人员")
-// private String registerUserName;
+
//
// @Excel(name = "隐患核查时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.2