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/EmergencySuppliesDetailRespDTO.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
index 873ab54..2b5fc0c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
@@ -4,11 +4,35 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfoDetailDO;
+import com.gkhy.safePlatform.emergency.model.dto.req.EmergencySuppliesInspectReqDTO;
+import com.gkhy.safePlatform.emergency.model.dto.req.EmergencySuppliesMaintainReqDTO;
import java.util.Date;
+import java.util.List;
public class EmergencySuppliesDetailRespDTO {
+ //保养列表
+ private List<EmergencySuppliesMaintainDetailRespDTO> maintainList;
+ //检查列表
+ private List<EmergencySuppliesInspectDetailRespDTO> inspectList;
+ public List<EmergencySuppliesMaintainDetailRespDTO> getMaintainList() {
+ return maintainList;
+ }
+
+ public void setMaintainList(List<EmergencySuppliesMaintainDetailRespDTO> maintainList) {
+ this.maintainList = maintainList;
+ }
+
+ public List<EmergencySuppliesInspectDetailRespDTO> getInspectList() {
+ return inspectList;
+ }
+
+ public void setInspectList(List<EmergencySuppliesInspectDetailRespDTO> inspectList) {
+ this.inspectList = inspectList;
+ }
+ //负责人名称
private String principalUserName;
public String getPrincipalUserName() {
@@ -21,29 +45,49 @@
@TableId(type = IdType.AUTO)
private Long id;
+ //生产日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionDate;
+ //投用日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date useDate;
+ //检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectDate;
+ //下次检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date nextInspectDate;
+ //检查周期/月
private Integer inspectPeriod;
+ //存储数量
private Integer count;
+ //使用期限/天
private Integer usePeriod;
+ //负责部门id
private Long departmentId;
+ //负责人uid
private Long principalUserUid;
- private String status;
- private String classification;
+ //状态（数据字典）
+ private Byte status;
+ //分类（数据字典）
+ private Byte classification;
+ //名称
private String name;
+ //编号
private String number;
+ //型号
private String model;
+ //经度
private String longitude;
+ //维度
private String latitude;
+ //用途
private String use;
+ //所属区域
private Long areaId;
+ //存放位置
private String place;
+ //使用说明
private String useExplain;
public Long getId() {
@@ -126,19 +170,19 @@
this.principalUserUid = principalUserUid;
}
- public String getStatus() {
+ public Byte getStatus() {
return status;
}
- public void setStatus(String status) {
+ public void setStatus(Byte status) {
this.status = status;
}
- public String getClassification() {
+ public Byte getClassification() {
return classification;
}
- public void setClassification(String classification) {
+ public void setClassification(Byte classification) {
this.classification = classification;
}
--
Gitblit v1.9.2