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/EmergencyPlanPageRespDTO.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
index 26aafc1..5aeda83 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
@@ -6,10 +6,21 @@
public class EmergencyPlanPageRespDTO {
- // 审批状态
+ // 最新的审批id
+ private Long approveId;
+
+ public Long getApproveId() {
+ return approveId;
+ }
+
+ public void setApproveId(Long approveId) {
+ this.approveId = approveId;
+ }
+
+ // 最新的审批状态
private Integer approveStatus;
- // 审批人
+ // 最新的审批人
private Long approvePersonId;
// 审批人是否为当前登录人
@@ -39,6 +50,7 @@
this.checkApprove = checkApprove;
}
+ //编写人名称
private String authorName;
public String getAuthorName() {
@@ -50,15 +62,15 @@
}
private Long id;
-
+ // 预案名称
private String name ;
-
+ //预案状态
private Integer status ;
-
- private String type;
-
- private String level;
-
+ //预案类型（数据字典）
+ private Byte type;
+ //预案级别（数据字典）
+ private Byte level;
+ //发布实施日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
@@ -87,19 +99,19 @@
this.status = status;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
- public String getLevel() {
+ public Byte getLevel() {
return level;
}
- public void setLevel(String level) {
+ public void setLevel(Byte level) {
this.level = level;
}
--
Gitblit v1.9.2