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/EmergencyDrillEvaluationInfo.java |  109 ++++++++++++++++++++----------------------------------
 1 files changed, 41 insertions(+), 68 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java
index fc88b02..7d1d791 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java
@@ -22,31 +22,31 @@
 
     private Long updateUid;
 
-    private Long drillPlanId;
+    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;
 
@@ -102,107 +102,107 @@
         this.updateUid = updateUid;
     }
 
-    public Long getDrillPlanId() {
-        return drillPlanId;
+    public Long getDrillExecuteId() {
+        return drillExecuteId;
     }
 
-    public void setDrillPlanId(Long drillPlanId) {
-        this.drillPlanId = drillPlanId;
+    public void setDrillExecuteId(Long drillExecuteId) {
+        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;
     }
 
@@ -230,31 +230,4 @@
         this.modifyContent = modifyContent;
     }
 
-    @Override
-    public String toString() {
-        return "EmergencyDrillEvaluationInfo{" +
-                "id=" + id +
-                ", delFlag=" + delFlag +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModitify=" + gmtModitify +
-                ", createUid=" + createUid +
-                ", updateUid=" + updateUid +
-                ", drillPlanId=" + drillPlanId +
-                ", suitable='" + suitable + '\'' +
-                ", sufficient='" + sufficient + '\'' +
-                ", arrival='" + arrival + '\'' +
-                ", supplies='" + supplies + '\'' +
-                ", protection='" + protection + '\'' +
-                ", whole='" + whole + '\'' +
-                ", division='" + division + '\'' +
-                ", effect='" + effect + '\'' +
-                ", report='" + report + '\'' +
-                ", safety='" + safety + '\'' +
-                ", rescue='" + rescue + '\'' +
-                ", evacuate='" + evacuate + '\'' +
-                ", needModify=" + needModify +
-                ", questionAndImprove='" + questionAndImprove + '\'' +
-                ", modifyContent='" + modifyContent + '\'' +
-                '}';
-    }
 }

--
Gitblit v1.9.2