From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: Wed, 30 Aug 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java b/src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java
index 93674dd..fb92ece 100644
--- a/src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java
+++ b/src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @email 1603559716@qq.com
@@ -28,6 +29,9 @@
* 2重大
*/
private Integer level;
+ /**
+ * 隐患附件
+ */
private String url;
private Boolean validFlag;
/**
@@ -36,25 +40,20 @@
private Long selfInspectionItemId;
/** 创建时间 create_time **/
private Date createTime;
-
/** 创建人 create_by **/
private String createBy;
-
/** 最新更新时间 update_time **/
private Date updateTime;
-
/** 最后更新人 update_by **/
private String updateBy;
-
/**
- * 整改状态 0未整改，1已整改
+ * 整改状态 -1未整改，1已整改
*/
private Byte status;
/**
* 整改描述
*/
private String rectificationInfo;
-
/**
* 整改附件
*/
@@ -73,5 +72,11 @@
private String reviewMethod;
@TableField(exist = false)
private String veto;
+ //隐患附件
+ @TableField(exist = false)
+ private List<AttachmentInfo> attachmentList;
+ //整改附件
+ @TableField(exist = false)
+ private List<AttachmentInfo> rattachmentList;
}
--
Gitblit v1.9.2