From 54843d459f3fe623e6cf2956f192141e9a99b878 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 30 十一月 2023 13:03:29 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java | 346 ++++++++++++++-------------------------------------------
1 files changed, 86 insertions(+), 260 deletions(-)
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 5cdd9bc..55ed7f0 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
@@ -4,6 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
+import lombok.Data;
import java.util.Date;
@@ -11,290 +12,115 @@
* 隐患排查台账导出对象
*
*/
+@Data
public class HiddenDangerCheckPointExport extends BaseEntity
{
@Excel(name = "序号")
private String index;
- @Excel(name = "排查方式")
- private String checkType;
+ @Excel(name = "隐患事实")
+ private String dangerDescription;
+ @Excel(name = "检查人员")
+ private String checkPerson;
- @Excel(name = "基础清单名称")
- private String baseRiskName;
+ @Excel(name = "排查日期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private String findTime;
- @Excel(name = "风险单元")
- private String riskPointName;
-
-
- @Excel(name = "风险单元类型")
- private String riskPointType;
-
-
- @Excel(name = "隐患名称")
- private String dangerName;
-
-// @Excel(name = "隐患图片", cellType = ColumnType.PICTURE)
- private String preRectifyPhoto;
-
- @Excel(name = "隐患类别")
- private String troubleTypeName;
-
- @Excel(name = "隐患级别")
+ @Excel(name = "隐患分级")
private String dangerLevel;
- @Excel(name = "隐患来源")
- private String dangerSources;
+ @Excel(name = "整改期限")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private String rectifyDeadlineTime;
- @Excel(name = "隐患责任部门")
- private String dangerDep;
-
- @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")
- private String examineCreateTime;
-
- @Excel(name = "核查人员")
- private String examineUserName;
-
- @Excel(name = "隐患整改时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String rectifyCreateTime;
-
- @Excel(name = "整改人员")
- private String rectifyUserName;
+ @Excel(name = "责任人")
+ private String judgeUserName;
@Excel(name = "整改措施")
private String rectifyMeasure;
-// @Excel(name = "隐患整改后照片", cellType = ColumnType.PICTURE)
- private String postRectifyPhoto;
-
- @Excel(name = "隐患验收时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String acceptCreateTime;
-
- @Excel(name = "验收人员")
- private String acceptUserName;
-
- @Excel(name = "隐患治理期限")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String rectifyDeadlineTime;
-
- @Excel(name = "整改完成时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "完成日期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private String rectifyCompleteTime;
- @Excel(name = "隐患描述")
- private String dangerDescription;
+ @Excel(name = "验证人")
+ private String acceptUserName;
- public String getRectifyDeadlineTime() {
- return rectifyDeadlineTime;
- }
+ @Excel(name = "验证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private String acceptCreateTime;
- public void setRectifyDeadlineTime(String rectifyDeadlineTime) {
- this.rectifyDeadlineTime = rectifyDeadlineTime;
- }
+ @Excel(name = "完成情况")
+ private String acceptOpinion;
- public String getRectifyCompleteTime() {
- return rectifyCompleteTime;
- }
- public void setRectifyCompleteTime(String rectifyCompleteTime) {
- this.rectifyCompleteTime = rectifyCompleteTime;
- }
+//
+// @Excel(name = "排查方式")
+// private String checkType;
+//
+//
+// @Excel(name = "基础清单名称")
+// private String baseRiskName;
+//
+// @Excel(name = "风险单元")
+// private String riskPointName;
+//
+//
+// @Excel(name = "风险单元类型")
+// private String riskPointType;
+//
+//
+// @Excel(name = "隐患名称")
+// private String dangerName;
- public String getDangerDescription() {
- return dangerDescription;
- }
+// @Excel(name = "隐患图片", cellType = ColumnType.PICTURE)
+// private String preRectifyPhoto;
+//
+// @Excel(name = "隐患类别")
+// private String troubleTypeName;
+//
+// @Excel(name = "隐患级别")
+// private String dangerLevel;
+//
+// @Excel(name = "隐患来源")
+// private String dangerSources;
+//
+// @Excel(name = "隐患责任部门")
+// private String dangerDep;
+//
+// @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")
+// private String examineCreateTime;
+//
+// @Excel(name = "核查人员")
+// private String examineUserName;
+//
+// @Excel(name = "隐患整改时间")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private String rectifyCreateTime;
+//
+// @Excel(name = "整改人员")
+// private String rectifyUserName;
+//
+// @Excel(name = "整改措施")
+// private String rectifyMeasure;
+//
+//// @Excel(name = "隐患整改后照片", cellType = ColumnType.PICTURE)
+// private String postRectifyPhoto;
- public void setDangerDescription(String dangerDescription) {
- this.dangerDescription = dangerDescription;
- }
- public String getPreRectifyPhoto() {
- return preRectifyPhoto;
- }
- public void setPreRectifyPhoto(String preRectifyPhoto) {
- this.preRectifyPhoto = preRectifyPhoto;
- }
-
- public String getTroubleTypeName() {
- return troubleTypeName;
- }
-
- public void setTroubleTypeName(String troubleTypeName) {
- this.troubleTypeName = troubleTypeName;
- }
-
- public String getRegisterUserName() {
- return registerUserName;
- }
-
- public void setRegisterUserName(String registerUserName) {
- this.registerUserName = registerUserName;
- }
-
- public String getExamineUserName() {
- return examineUserName;
- }
-
- public void setExamineUserName(String examineUserName) {
- this.examineUserName = examineUserName;
- }
-
- public String getDangerDep() {
- return dangerDep;
- }
-
- public void setDangerDep(String dangerDep) {
- this.dangerDep = dangerDep;
- }
-
- public String getRectifyUserName() {
- return rectifyUserName;
- }
-
- public void setRectifyUserName(String rectifyUserName) {
- this.rectifyUserName = rectifyUserName;
- }
-
- public String getRectifyMeasure() {
- return rectifyMeasure;
- }
-
- public void setRectifyMeasure(String rectifyMeasure) {
- this.rectifyMeasure = rectifyMeasure;
- }
-
- public String getPostRectifyPhoto() {
- return postRectifyPhoto;
- }
-
- public void setPostRectifyPhoto(String postRectifyPhoto) {
- this.postRectifyPhoto = postRectifyPhoto;
- }
-
- public String getAcceptUserName() {
- return acceptUserName;
- }
-
- public void setAcceptUserName(String acceptUserName) {
- this.acceptUserName = acceptUserName;
- }
-
- public String getIndex() {
- return index;
- }
-
- public void setIndex(String index) {
- this.index = index;
- }
-
- public String getRegisterCreateTime() {
- return registerCreateTime;
- }
-
- public void setRegisterCreateTime(String registerCreateTime) {
- this.registerCreateTime = registerCreateTime;
- }
-
- public String getExamineCreateTime() {
- return examineCreateTime;
- }
-
- public void setExamineCreateTime(String examineCreateTime) {
- this.examineCreateTime = examineCreateTime;
- }
-
- public String getRectifyCreateTime() {
- return rectifyCreateTime;
- }
-
- public void setRectifyCreateTime(String rectifyCreateTime) {
- this.rectifyCreateTime = rectifyCreateTime;
- }
-
- public String getAcceptCreateTime() {
- return acceptCreateTime;
- }
-
- public void setAcceptCreateTime(String acceptCreateTime) {
- this.acceptCreateTime = acceptCreateTime;
- }
-
- public String getCheckType() {
- return checkType;
- }
-
- public void setCheckType(String checkType) {
- this.checkType = checkType;
- }
-
- public String getBaseRiskName() {
- return baseRiskName;
- }
-
- public void setBaseRiskName(String baseRiskName) {
- this.baseRiskName = baseRiskName;
- }
-
- public String getRiskPointName() {
- return riskPointName;
- }
-
- public void setRiskPointName(String riskPointName) {
- this.riskPointName = riskPointName;
- }
-
- public String getRiskPointType() {
- return riskPointType;
- }
-
- public void setRiskPointType(String riskPointType) {
- this.riskPointType = riskPointType;
- }
-
- public String getDangerName() {
- return dangerName;
- }
-
- public void setDangerName(String dangerName) {
- this.dangerName = dangerName;
- }
-
- public String getDangerLevel() {
- return dangerLevel;
- }
-
- public void setDangerLevel(String dangerLevel) {
- this.dangerLevel = dangerLevel;
- }
-
- public String getDangerSources() {
- return dangerSources;
- }
-
- public void setDangerSources(String dangerSources) {
- this.dangerSources = dangerSources;
- }
-
- public String getRectifyStatus() {
- return rectifyStatus;
- }
-
- public void setRectifyStatus(String rectifyStatus) {
- this.rectifyStatus = rectifyStatus;
- }
}
--
Gitblit v1.9.2