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/entity/SafeMaterialDetailInfoDO.java |   79 +++++++++++++++++++++++++++------------
 1 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfoDO.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfoDO.java
index f86b007..7669f3b 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfoDO.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfoDO.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 public class SafeMaterialDetailInfoDO {
     /**
@@ -18,14 +19,15 @@
      * 物资编号
      */
     private String materialNo;
+    private Long smallClassifyId;
     /**
      * 物资类型id
      */
-    private Long materialClassifyId;
+    private Long bigClassifyId;
     /**
      * 物资类型名称
      */
-    private String materialClassifyName;
+    private String bigClassifyName;
     /**
      * RFID
      */
@@ -50,12 +52,16 @@
     /**
      * 保质到期时间
      */
-    @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;
     /**
      * 状态
      */
     private Byte validStatus;
+
+    private Byte status;
+
+    private String remark;
     /**
      * 出入库状态
      */
@@ -77,12 +83,12 @@
     /**
      * 认领人id
      */
-    private Long claimantId;
+    private Long receiveUid;
 
     /**
      * 认领人姓名
      */
-    private String claimantName;
+    private String receiveUname;
 
     public Long getId() {
         return id;
@@ -108,20 +114,20 @@
         this.materialNo = materialNo;
     }
 
-    public Long getMaterialClassifyId() {
-        return materialClassifyId;
+    public Long getBigClassifyId() {
+        return bigClassifyId;
     }
 
-    public void setMaterialClassifyId(Long materialClassifyId) {
-        this.materialClassifyId = materialClassifyId;
+    public void setBigClassifyId(Long bigClassifyId) {
+        this.bigClassifyId = bigClassifyId;
     }
 
-    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 getRfid() {
@@ -164,11 +170,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;
     }
 
@@ -212,19 +218,44 @@
         this.smId = smId;
     }
 
-    public Long getClaimantId() {
-        return claimantId;
+
+    public Long getSmallClassifyId() {
+        return smallClassifyId;
     }
 
-    public void setClaimantId(Long claimantId) {
-        this.claimantId = claimantId;
+    public void setSmallClassifyId(Long smallClassifyId) {
+        this.smallClassifyId = smallClassifyId;
     }
 
-    public String getClaimantName() {
-        return claimantName;
+    public Long getReceiveUid() {
+        return receiveUid;
     }
 
-    public void setClaimantName(String claimantName) {
-        this.claimantName = claimantName;
+    public void setReceiveUid(Long receiveUid) {
+        this.receiveUid = receiveUid;
+    }
+
+    public String getReceiveUname() {
+        return receiveUname;
+    }
+
+    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;
     }
 }

--
Gitblit v1.9.2