From 53e7dce8d55487cbac64e4374ec9aa1b52a6c6ed Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: Thu, 09 Mar 2023 21:16:43 +0800
Subject: [PATCH] 解决npe问题

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDetailDto.java |   99 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDetailDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDetailDto.java
index b6478e8..4b26ec8 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDetailDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDetailDto.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 public class SafeMaterialDetailDto {
     /**
@@ -16,10 +17,14 @@
      * 物资编号
      */
     private String materialNo;
+
+    private Long bigClassifyId;
     /**
      * 物资类型名称
      */
-    private String materialClassifyName;
+    private String bigClassifyName;
+
+    private Long depId;
     /**
      * 部门名称
      */
@@ -43,8 +48,8 @@
     /**
      * 保质到期时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime validTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date validTime;
     /**
      * 状态
      */
@@ -75,7 +80,25 @@
     /**
      * 认领人姓名
      */
-    private String claimantName;
+    private String receiveUname;
+    /**
+     * 物资状态
+     */
+    private Byte status;
+    /**
+     * 物资状态名称
+     */
+    private String statusName;
+    /**
+     * 描述
+     */
+    private String remark;
+
+    /**
+     * 安全物资管理id
+     * @return
+     */
+    private Long smId;
 
     public Long getId() {
         return id;
@@ -117,12 +140,12 @@
         this.rfid = rfid;
     }
 
-    public String getMaterialClassifyName() {
-        return materialClassifyName;
+    public String getBigClassifyName() {
+        return bigClassifyName;
     }
 
-    public void setMaterialClassifyName(String materialClassifyName) {
-        this.materialClassifyName = materialClassifyName;
+    public void setBigClassifyName(String bigClassifyName) {
+        this.bigClassifyName = bigClassifyName;
     }
 
     public String getConsumableName() {
@@ -141,11 +164,11 @@
         this.validType = validType;
     }
 
-    public LocalDateTime getValidTime() {
+    public Date getValidTime() {
         return validTime;
     }
 
-    public void setValidTime(LocalDateTime validTime) {
+    public void setValidTime(Date validTime) {
         this.validTime = validTime;
     }
 
@@ -197,12 +220,28 @@
         this.deliveryTime = deliveryTime;
     }
 
-    public String getClaimantName() {
-        return claimantName;
+    public String getReceiveUname() {
+        return receiveUname;
     }
 
-    public void setClaimantName(String claimantName) {
-        this.claimantName = claimantName;
+    public void setReceiveUname(String receiveUname) {
+        this.receiveUname = receiveUname;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 
     public String getValidTypeName() {
@@ -212,4 +251,36 @@
     public void setValidTypeName(String validTypeName) {
         this.validTypeName = validTypeName;
     }
+
+    public Long getSmId() {
+        return smId;
+    }
+
+    public void setSmId(Long smId) {
+        this.smId = smId;
+    }
+
+    public Long getBigClassifyId() {
+        return bigClassifyId;
+    }
+
+    public void setBigClassifyId(Long bigClassifyId) {
+        this.bigClassifyId = bigClassifyId;
+    }
+
+    public Long getDepId() {
+        return depId;
+    }
+
+    public void setDepId(Long depId) {
+        this.depId = depId;
+    }
+
+    public String getStatusName() {
+        return statusName;
+    }
+
+    public void setStatusName(String statusName) {
+        this.statusName = statusName;
+    }
 }

--
Gitblit v1.9.2