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/SafetySelfInspection.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Domain/SafetySelfInspection.java b/src/main/java/com/gk/hotwork/Domain/SafetySelfInspection.java
index c01ae2a..1dc0ed2 100644
--- a/src/main/java/com/gk/hotwork/Domain/SafetySelfInspection.java
+++ b/src/main/java/com/gk/hotwork/Domain/SafetySelfInspection.java
@@ -60,8 +60,7 @@
private Date inspectionStartTime;
/** 检查结束时间 **/
- @TableField(exist = false)
- @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date inspectionEndTime;
/** 检查项集合 **/
@@ -102,6 +101,7 @@
//检查标识 2自查，1监管检查
private Byte flag;
+
/**
* 隐患总数
*/
@@ -118,11 +118,23 @@
@TableField(exist = false)
private Integer majorCount;
/**
- * 整改状态 0未整改 1部分整改 2全部整改
+ * 整改状态 -1未整改 1部分整改 2全部整改
*/
@TableField(exist = false)
private Integer rectificationStatus;
+ //检查清单附件
+ @TableField(exist = false)
+ private List<AttachmentInfo> attachmentList;
+
+ public List<AttachmentInfo> getAttachmentList() {
+ return attachmentList;
+ }
+
+ public void setAttachmentList(List<AttachmentInfo> attachmentList) {
+ this.attachmentList = attachmentList;
+ }
+
public List<InspectionExpert> getExpertList() {
return expertList;
}
--
Gitblit v1.9.2