From ef406c4432c290f2627fa3742a1489e660dcc239 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期六, 22 七月 2023 18:30:26 +0800
Subject: [PATCH] 检查修改
---
src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionItem.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 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 f2ffca4..a065214 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;
/** 否决项说明 **/
@@ -42,13 +42,13 @@
/** 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)
@@ -75,6 +75,10 @@
/** 扣分项集合 **/
private List<SafetySelfInspectionItemDeduction> selfDeductionList;
+ @TableField(exist = false)
+ /** 隐患项集合 **/
+ private List<InspectionHiddenDanger> dangerList;
+
/** 主键id id **/
@TableId(type = IdType.AUTO)
@@ -94,6 +98,38 @@
/** 最后更新人 update_by **/
private String updateBy;
+
+ /*专家id*/
+ private String expertIds;
+ /**
+ * 专家名称
+ */
+ private String expertNames;
+
+
+ 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;
@@ -259,19 +295,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