From 53e7dce8d55487cbac64e4374ec9aa1b52a6c6ed Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 09 三月 2023 21:16:43 +0800
Subject: [PATCH] 解决npe问题
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java | 133 +++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 50 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java
index 8459428..e4dcec2 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java
@@ -14,6 +14,27 @@
// 应急演练计划
+
+ private String emergencyPlanName;
+
+ private String makingUserName;
+
+ public String getEmergencyPlanName() {
+ return emergencyPlanName;
+ }
+
+ public void setEmergencyPlanName(String emergencyPlanName) {
+ this.emergencyPlanName = emergencyPlanName;
+ }
+
+ public String getMakingUserName() {
+ return makingUserName;
+ }
+
+ public void setMakingUserName(String makingUserName) {
+ this.makingUserName = makingUserName;
+ }
+
private Date makingPlanDate;
private Date drillPlanDate;
@@ -26,13 +47,13 @@
private BigDecimal drillExpense;
- private String drillLevel;
+ private Byte drillLevel;
private String drillAddress;
private String drillName;
- private String drillWay;
+ private Byte drillWay;
private String insuranceMeasures;
@@ -41,6 +62,18 @@
private String purpose;
// 应急演练实施
+
+ private String recordUserName;
+
+
+ public String getRecordUserName() {
+ return recordUserName;
+ }
+
+ public void setRecordUserName(String recordUserName) {
+ this.recordUserName = recordUserName;
+ }
+
private Long drillPlanId;
private Date drillRecordDate;
@@ -99,11 +132,11 @@
this.drillExpense = drillExpense;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
@@ -123,11 +156,11 @@
this.drillName = drillName;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
@@ -193,35 +226,43 @@
private Long drillExecuteId;
- private String suitable;
+ private Byte suitable;
- private String sufficient;
+ private Byte sufficient;
- private String arrival;
+ private Byte arrival;
- private String supplies;
+ private Byte supplies;
- private String protection;
+ private Byte protection;
- private String whole;
+ private Byte whole;
- private String division;
+ private Byte division;
- private String effect;
+ private Byte effect;
- private String report;
+ private Byte report;
- private String safety;
+ private Byte safety;
- private String rescue;
+ private Byte rescue;
- private String evacuate;
+ private Byte evacuate;
private Boolean needModify;
private String questionAndImprove;
private String modifyContent;
+
+ public Long getDrillPlanId() {
+ return drillPlanId;
+ }
+
+ public void setDrillPlanId(Long drillPlanId) {
+ this.drillPlanId = drillPlanId;
+ }
public Long getId() {
return id;
@@ -239,99 +280,99 @@
this.drillExecuteId = drillExecuteId;
}
- public String getSuitable() {
+ public Byte getSuitable() {
return suitable;
}
- public void setSuitable(String suitable) {
+ public void setSuitable(Byte suitable) {
this.suitable = suitable;
}
- public String getSufficient() {
+ public Byte getSufficient() {
return sufficient;
}
- public void setSufficient(String sufficient) {
+ public void setSufficient(Byte sufficient) {
this.sufficient = sufficient;
}
- public String getArrival() {
+ public Byte getArrival() {
return arrival;
}
- public void setArrival(String arrival) {
+ public void setArrival(Byte arrival) {
this.arrival = arrival;
}
- public String getSupplies() {
+ public Byte getSupplies() {
return supplies;
}
- public void setSupplies(String supplies) {
+ public void setSupplies(Byte supplies) {
this.supplies = supplies;
}
- public String getProtection() {
+ public Byte getProtection() {
return protection;
}
- public void setProtection(String protection) {
+ public void setProtection(Byte protection) {
this.protection = protection;
}
- public String getWhole() {
+ public Byte getWhole() {
return whole;
}
- public void setWhole(String whole) {
+ public void setWhole(Byte whole) {
this.whole = whole;
}
- public String getDivision() {
+ public Byte getDivision() {
return division;
}
- public void setDivision(String division) {
+ public void setDivision(Byte division) {
this.division = division;
}
- public String getEffect() {
+ public Byte getEffect() {
return effect;
}
- public void setEffect(String effect) {
+ public void setEffect(Byte effect) {
this.effect = effect;
}
- public String getReport() {
+ public Byte getReport() {
return report;
}
- public void setReport(String report) {
+ public void setReport(Byte report) {
this.report = report;
}
- public String getSafety() {
+ public Byte getSafety() {
return safety;
}
- public void setSafety(String safety) {
+ public void setSafety(Byte safety) {
this.safety = safety;
}
- public String getRescue() {
+ public Byte getRescue() {
return rescue;
}
- public void setRescue(String rescue) {
+ public void setRescue(Byte rescue) {
this.rescue = rescue;
}
- public String getEvacuate() {
+ public Byte getEvacuate() {
return evacuate;
}
- public void setEvacuate(String evacuate) {
+ public void setEvacuate(Byte evacuate) {
this.evacuate = evacuate;
}
@@ -357,13 +398,5 @@
public void setModifyContent(String modifyContent) {
this.modifyContent = modifyContent;
- }
-
- public Long getDrillPlanId() {
- return drillPlanId;
- }
-
- public void setDrillPlanId(Long drillPlanId) {
- this.drillPlanId = drillPlanId;
}
}
--
Gitblit v1.9.2