From 3c8f3a7b74f62a9053cd9d860d8f1d37454712eb Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期一, 04 九月 2023 17:53:59 +0800
Subject: [PATCH] back

---
 src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionItem.java |   84 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionItem.java b/src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionItem.java
index 59bb7e3..548fc40 100644
--- a/src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionItem.java
+++ b/src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionItem.java
@@ -21,7 +21,7 @@
     /** 检查项id  safety_inspection_item_id  **/
     private Long safetyInspectionItemId;
 
-    /** 检查结果0:否决 1:扣分  safety_inspection_item_result **/
+    /** 检查结果0:否决 1:扣分 2:合格 safety_inspection_item_result **/
     private Integer safetyInspectionItemResult;
 
     /** 否决项说明 **/
@@ -33,15 +33,23 @@
     /** B级要素名称   **/
     @TableField(exist = false)
     private String elementBName;
+    /** C级要素名称   **/
+    @TableField(exist = false)
+    private String elementCName;
+
+    @TableField(exist = false)
+    private Long elementC;
+
     /** A级要素   **/
     @TableField(exist = false)
-    private Integer elementA;
+    private Long elementA;
     /** A级要素权重   **/
     @TableField(exist = false)
     private Float elementAWeight;
     /** B级要素   **/
     @TableField(exist = false)
-    private Integer elementB;
+    private Long elementB;
+
     /** B级要素   **/
     @TableField(exist = false)
     private Integer point;
@@ -67,6 +75,10 @@
     /** 扣分项集合   **/
     private List<SafetySelfInspectionItemDeduction> selfDeductionList;
 
+    @TableField(exist = false)
+    /** 隐患项集合   **/
+    private List<InspectionHiddenDanger> dangerList;
+
 
     /** 主键id  id **/
     @TableId(type = IdType.AUTO)
@@ -87,6 +99,64 @@
     /** 最后更新人  update_by **/
     private String updateBy;
 
+    /*专家id*/
+    private String expertIds;
+    /**
+     * 专家名称
+     */
+    private String expertNames;
+
+    //附件
+    @TableField(exist = false)
+    private List<AttachmentInfo> attachmentList;
+
+    public List<AttachmentInfo> getAttachmentList() {
+        return attachmentList;
+    }
+
+    public void setAttachmentList(List<AttachmentInfo> attachmentList) {
+        this.attachmentList = attachmentList;
+    }
+
+    public String getExpertIds() {
+        return expertIds;
+    }
+
+    public void setExpertIds(String expertIds) {
+        this.expertIds = expertIds;
+    }
+
+    public String getExpertNames() {
+        return expertNames;
+    }
+
+    public void setExpertNames(String expertNames) {
+        this.expertNames = expertNames;
+    }
+
+    public List<InspectionHiddenDanger> getDangerList() {
+        return dangerList;
+    }
+
+    public void setDangerList(List<InspectionHiddenDanger> dangerList) {
+        this.dangerList = dangerList;
+    }
+
+    public String getElementCName() {
+        return elementCName;
+    }
+
+    public void setElementCName(String elementCName) {
+        this.elementCName = elementCName;
+    }
+
+    public Long getElementC() {
+        return elementC;
+    }
+
+    public void setElementC(Long elementC) {
+        this.elementC = elementC;
+    }
 
     /**   主键id  id   **/
     public Long getId() {
@@ -236,19 +306,19 @@
         this.selfDeductionList = selfDeductionList;
     }
 
-    public Integer getElementA() {
+    public Long getElementA() {
         return elementA;
     }
 
-    public void setElementA(Integer elementA) {
+    public void setElementA(Long elementA) {
         this.elementA = elementA;
     }
 
-    public Integer getElementB() {
+    public Long getElementB() {
         return elementB;
     }
 
-    public void setElementB(Integer elementB) {
+    public void setElementB(Long elementB) {
         this.elementB = elementB;
     }
 

--
Gitblit v1.9.2