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/EmergencyDrillPlanDetailRespDTO.java | 78 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
index c21c1da..5c0ea9c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
@@ -7,47 +7,77 @@
import java.util.List;
public class EmergencyDrillPlanDetailRespDTO {
+ //预案名称
+ private String planName;
+
+ public String getPlanName() {
+ return planName;
+ }
+
+ public void setPlanName(String planName) {
+ this.planName = planName;
+ }
+ //计划制定人名称
+ private String makingUserName;
+
+ public String getMakingUserName() {
+ return makingUserName;
+ }
+
+ public void setMakingUserName(String makingUserName) {
+ this.makingUserName = makingUserName;
+ }
private Long id;
-
+ //更新日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gmtModitify;
-
+ //状态
private Integer status;
-
+ //计划制定日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date makingPlanDate;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
-
+ //计划制定人uid
private Long makingUserUid;
-
+ //计划制定部门ID
private Long makingDepartmentId;
-
+ //应急预案ID
private Long planId;
-
+ //主办部门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> fileList;
-
+ //人员列表
private List<EmergencyDrillPlanUserRespDTO> userList;
+ //负责人列表
+ private List<EmergencyDrillPlanUserRespDTO> chargeUserList;
+
+ public List<EmergencyDrillPlanUserRespDTO> getChargeUserList() {
+ return chargeUserList;
+ }
+
+ public void setChargeUserList(List<EmergencyDrillPlanUserRespDTO> chargeUserList) {
+ this.chargeUserList = chargeUserList;
+ }
public Long getId() {
return id;
@@ -129,11 +159,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;
}
@@ -153,11 +183,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;
}
--
Gitblit v1.9.2