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/resp/EmergencyDrillEvaluationDetailRespDTO.java | 169 ++++++++++++++++++++++++++++----------------------------
1 files changed, 85 insertions(+), 84 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
index d1cbb6a..47fcd80 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
@@ -8,9 +8,9 @@
public class EmergencyDrillEvaluationDetailRespDTO {
- // 应急演练计划
+ // 应急预案名称
private String emergencyPlanName;
-
+ // 计划制定人名称
private String makingUserName;
public String getEmergencyPlanName() {
@@ -28,39 +28,39 @@
public void setMakingUserName(String makingUserName) {
this.makingUserName = makingUserName;
}
-
+ //计划制定日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date makingPlanDate;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date drillPlanDate;
-
+ //计划制定人uid
private Long makingUserUid;
-
+ //计划制定部门ID
private Long makingDepartmentId;
-
+ //主办部门ID
private Long departmentId;
-
+ //演练经费
private BigDecimal drillExpense;
-
- private String drillLevel;
-
+ //演练级别（数据字典）
+ private Byte drillLevel;
+ //演练地点
private String drillAddress;
-
+ //演练名称
private String drillName;
-
- private String drillWay;
-
+ //演练方式（数据字典）
+ private Byte drillWay;
+ //保险措施
private String insuranceMeasures;
-
+ //备注
private String remark;
-
+ //演练目的
private String purpose;
-
+ //演练计划文件列表
private List<EmergencyDrillPlanFileRespDTO> planFileList;
-
+ //演练计划人员列表
private List<EmergencyDrillPlanUserRespDTO> planUserList;
-
+ //演练计划负责人人员列表
private List<EmergencyDrillPlanUserRespDTO> planChargeUserList;
public List<EmergencyDrillPlanUserRespDTO> getPlanChargeUserList() {
@@ -73,6 +73,7 @@
// 应急演练实施
+ //记录人名称
private String recordUserName;
public String getRecordUserName() {
@@ -82,55 +83,55 @@
public void setRecordUserName(String recordUserName) {
this.recordUserName = recordUserName;
}
-
+ //演练计划id
private Long drillPlanId;
-
+ //演练记录时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date drillRecordDate;
-
+ //记录人uid
private Long recordUserUid;
-
+ //演练过程描述
private String processDesc;
-
+ //演练计划实施人员列表
private List<EmergencyDrillExecuteUserRespDTO> executeUserList;
- // 评价
+ // 评价id
private Long id;
-
+ //演练实施ID
private Long drillExecuteId;
-
- 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;
-
+ //适宜性
+ 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<EmergencyDrillEvaluationFileRespDTO> evaluationFileList;
-
+ //评价人员列表
private List<EmergencyDrillEvaluationUserRespDTO> evaluationUserList;
public Date getMakingPlanDate() {
@@ -181,11 +182,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;
}
@@ -205,11 +206,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;
}
@@ -301,99 +302,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;
}
--
Gitblit v1.9.2