From 6049cbf3978acd6097665a33bd8a0d88b3ab0324 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 12 十二月 2023 15:49:19 +0800
Subject: [PATCH] 临时提交
---
src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml | 1 +
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java | 12 ++++++++++++
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 11 +++++++++++
3 files changed, 24 insertions(+), 0 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 a989637..5c4ad1e 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
@@ -186,6 +186,17 @@
export.setAcceptOpinion(hcp.getAcceptOpinion());
}
+ //上报时间。判定人、核查人
+ if (ObjectUtils.isNotEmpty(hcp.getRegisterCreateTime())){
+ export.setRegisterCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRegisterCreateTime()));
+ }
+ if (ObjectUtils.isNotEmpty(hcp.getJudgeUserName())){
+ export.setJudgeUserName1(hcp.getJudgeUserName());
+ }
+ if (ObjectUtils.isNotEmpty(hcp.getExamineUserName())){
+ export.setExamineUserName(hcp.getExamineUserName());
+ }
+
}
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 55ed7f0..aa4857b 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
@@ -56,6 +56,18 @@
@Excel(name = "完成情况")
private String acceptOpinion;
+ @Excel(name = "上报时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String registerCreateTime;
+
+ @Excel(name = "判定人")
+ private String judgeUserName1;
+
+ @Excel(name = "核查人")
+ private String examineUserName;
+
+
+
//
// @Excel(name = "排查方式")
diff --git a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
index 60fefe5..de03ff4 100644
--- a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
+++ b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
@@ -348,6 +348,7 @@
#{companyId}
</foreach>)
</if>
+ and (a.whether_danger = 1 or a.whether_danger is null)
</where>
<!-- todo 查找验收条件，将待验收的放在前面-->
order by a.accept_status, a.create_time desc
--
Gitblit v1.9.2