From 145d0064af5ceca7a2f0d244aa8d50a8f594f3d7 Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: Fri, 04 Aug 2023 09:42:05 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/gk/hotwork/Domain/SafetySelfInspection.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 114 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 32a6081..1dc0ed2 100644
--- a/src/main/java/com/gk/hotwork/Domain/SafetySelfInspection.java
+++ b/src/main/java/com/gk/hotwork/Domain/SafetySelfInspection.java
@@ -60,14 +60,22 @@
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;
/** 检查项集合 **/
@TableField(exist = false)
private List<SafetySelfInspectionItem> itemList;
-
+ /**
+ * 一级要素
+ */
+ @TableField(exist = false)
+ private List<SafetyInspectionElementA> elementAList;
+ /**
+ * 评价专家
+ */
+ @TableField(exist = false)
+ private List<InspectionExpert> expertList;
/** 主键id id **/
@TableId(type = IdType.AUTO)
@@ -88,6 +96,109 @@
/** 最后更新人 update_by **/
private String updateBy;
+ /** 检查单位 **/
+ private String checkUnit;
+
+ //检查标识 2自查，1监管检查
+ private Byte flag;
+
+ /**
+ * 隐患总数
+ */
+ @TableField(exist = false)
+ private Integer hdTocalCount;
+ /**
+ * 一般隐患数量
+ */
+ @TableField(exist = false)
+ private Integer sameAsCount;
+ /**
+ * 重大隐患数量
+ */
+ @TableField(exist = false)
+ private Integer majorCount;
+ /**
+ * 整改状态 -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;
+ }
+
+ public Integer getHdTocalCount() {
+ return hdTocalCount;
+ }
+
+ public void setHdTocalCount(Integer hdTocalCount) {
+ this.hdTocalCount = hdTocalCount;
+ }
+
+ public Integer getSameAsCount() {
+ return sameAsCount;
+ }
+
+ public void setSameAsCount(Integer sameAsCount) {
+ this.sameAsCount = sameAsCount;
+ }
+
+ public Integer getMajorCount() {
+ return majorCount;
+ }
+
+ public void setMajorCount(Integer majorCount) {
+ this.majorCount = majorCount;
+ }
+
+ public Integer getRectificationStatus() {
+ return rectificationStatus;
+ }
+
+ public void setRectificationStatus(Integer rectificationStatus) {
+ this.rectificationStatus = rectificationStatus;
+ }
+
+ public void setExpertList(List<InspectionExpert> expertList) {
+ this.expertList = expertList;
+ }
+
+ public String getCheckUnit() {
+ return checkUnit;
+ }
+
+ public void setCheckUnit(String checkUnit) {
+ this.checkUnit = checkUnit;
+ }
+
+ public Byte getFlag() {
+ return flag;
+ }
+
+ public void setFlag(Byte flag) {
+ this.flag = flag;
+ }
+
+ public List<SafetyInspectionElementA> getElementAList() {
+ return elementAList;
+ }
+
+ public void setElementAList(List<SafetyInspectionElementA> elementAList) {
+ this.elementAList = elementAList;
+ }
+
public Long getCheckedCompanyId() {
return checkedCompanyId;
--
Gitblit v1.9.2