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/SafeMaterialDetailInfo.java |   76 ++++++++++++++++++++++++++++---------
 1 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfo.java
index 310e2a5..1329793 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfo.java
@@ -5,6 +5,7 @@
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @TableName("safe_material_detail")
 public class SafeMaterialDetailInfo implements Serializable {
@@ -24,9 +25,13 @@
      */
     private String materialNo;
     /**
-     * 物资类型id
+     * 物资类型id 大类
      */
-    private Long materialClassifyId;
+    private Long bigClassifyId;
+    /**
+     * 物资类型id 小类
+     */
+    private Long smallClassifyId;
     /**
      * RFID
      */
@@ -42,7 +47,7 @@
     /**
      * 保质到期时间
      */
-    private LocalDateTime validTime;
+    private Date validTime;
     /**
      * 状态
      */
@@ -66,13 +71,21 @@
     /**
      * 认领人id
      */
-    private Long claimantId;
+    private Long receiveUid;
 
     /**
      * 认领人姓名
      */
-    private String claimantName;
+    private String receiveUname;
 
+    /**
+     * 无效原因
+     */
+    private Byte status;
+    /**
+     * 描述
+     */
+    private String remark;
     /**
      * 删除标识
      */
@@ -135,12 +148,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 Long getSmallClassifyId() {
+        return smallClassifyId;
+    }
+
+    public void setSmallClassifyId(Long smallClassifyId) {
+        this.smallClassifyId = smallClassifyId;
     }
 
     public String getRfid() {
@@ -167,11 +188,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;
     }
 
@@ -271,19 +292,36 @@
         this.updateTime = updateTime;
     }
 
-    public Long getClaimantId() {
-        return claimantId;
+    public Long getReceiveUid() {
+        return receiveUid;
     }
 
-    public void setClaimantId(Long claimantId) {
-        this.claimantId = claimantId;
+    public void setReceiveUid(Long receiveUid) {
+        this.receiveUid = receiveUid;
     }
 
-    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;
     }
 }

--
Gitblit v1.9.2