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/model/dto/req/EmergencyDrillEvaluationReqDTO.java | 142 +++++++++++++++++++---------------------------
1 files changed, 59 insertions(+), 83 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
index 8be8076..f578a23 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
@@ -11,40 +11,41 @@
private Long id;
- private Long drillPlanId;
-
- private String suitable;
-
- private String sufficient;
-
- private String arrival;
-
- private String supplies;
-
- private String protection;
-
- private String whole;
-
- private String division;
-
- private String effect;
-
- private String report;
-
- private String safety;
-
- private String rescue;
-
- private String evacuate;
-
+ // 应急演练实施的id
+ private Long drillExecuteId;
+ //适宜性
+ private Byte suitable;
+ //充分性
+ private Byte sufficient;
+ //人员到位情况
+ private Byte arrival;
+ //物资到位情况-现场物资
+ private Byte supplies;
+ //物资到位情况-个人防护
+ private Byte protection;
+ //协调组织情况-整体组织
+ private Byte whole;
+ //协调组织情况-疏散组分工
+ private Byte division;
+ //实战效果评价
+ private Byte effect;
+ //支援部门和协作有效性-报告上级
+ private Byte report;
+ //支援部门和协作有效性-安全部门
+ private Byte safety;
+ //支援部门和协作有效性-救援后勤部门
+ private Byte rescue;
+ //支援部门和协作有效性-警戒撤离配合
+ private Byte evacuate;
+ //是否需要修改应急预案：0否1是
private Boolean needModify;
-
+ //存在问题和改进措施
private String questionAndImprove;
-
+ //修改内容
private String modifyContent;
-
+ //文件列表
private List<EmergencyDrillEvaluationFileReqDTO> fileList;
-
+ //人员列表
private List<EmergencyDrillEvaluationUserReqDTO> userList;
public Long getId() {
@@ -55,107 +56,107 @@
this.id = id;
}
- 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;
}
@@ -197,30 +198,5 @@
public void setUserList(List<EmergencyDrillEvaluationUserReqDTO> userList) {
this.userList = userList;
- }
-
- @Override
- public String toString() {
- return "EmergencyDrillEvaluationReqDTO{" +
- "id=" + id +
- ", 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 + '\'' +
- ", fileList=" + fileList +
- ", userList=" + userList +
- '}';
}
}
--
Gitblit v1.9.2