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/EmergencyDrillEvaluationPageRespDTO.java | 90 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 7 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
index 6825661..1624463 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
@@ -1,10 +1,86 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
public class EmergencyDrillEvaluationPageRespDTO {
+ //应急预案名称
+ private String emergencyPlanName;
+
+ public String getEmergencyPlanName() {
+ return emergencyPlanName;
+ }
+
+ public void setEmergencyPlanName(String emergencyPlanName) {
+ this.emergencyPlanName = emergencyPlanName;
+ }
+ //演练名称
+ private String drillName;
+ //演练地点
+ private String drillAddress;
+ //演练方式
+ private Byte drillWay;
+ //演练级别
+ private Byte drillLevel;
+ //计划演练日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date drillPlanDate;
+ //演练记录时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date drillRecordDate;
+
+ public String getDrillName() {
+ return drillName;
+ }
+
+ public void setDrillName(String drillName) {
+ this.drillName = drillName;
+ }
+
+ public String getDrillAddress() {
+ return drillAddress;
+ }
+
+ public void setDrillAddress(String drillAddress) {
+ this.drillAddress = drillAddress;
+ }
+
+ public Byte getDrillWay() {
+ return drillWay;
+ }
+
+ public void setDrillWay(Byte drillWay) {
+ this.drillWay = drillWay;
+ }
+
+ public Byte getDrillLevel() {
+ return drillLevel;
+ }
+
+ public void setDrillLevel(Byte drillLevel) {
+ this.drillLevel = drillLevel;
+ }
+
+ public Date getDrillPlanDate() {
+ return drillPlanDate;
+ }
+
+ public void setDrillPlanDate(Date drillPlanDate) {
+ this.drillPlanDate = drillPlanDate;
+ }
+
+ public Date getDrillRecordDate() {
+ return drillRecordDate;
+ }
+
+ public void setDrillRecordDate(Date drillRecordDate) {
+ this.drillRecordDate = drillRecordDate;
+ }
private Long id;
-
- private Long drillPlanId;
+ //演练实施id
+ private Long drillExecuteId;
public Long getId() {
@@ -15,12 +91,12 @@
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;
}
@@ -28,7 +104,7 @@
public String toString() {
return "EmergencyDrillEvaluationInfo{" +
"id=" + id +
- ", drillPlanId=" + drillPlanId +
+ ", drillExecuteId=" + drillExecuteId +
'}';
}
}
--
Gitblit v1.9.2