From d1480e6c40cbcaf7e0dd6349153a461a3635bee3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 19 八月 2024 09:04:39 +0800
Subject: [PATCH] #优化

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   94 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 22fcbdb..5e8abe8 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -3,13 +3,12 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
-import com.core.exception.CoolException;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
+import com.zy.common.utils.Synchro;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -36,7 +35,7 @@
     @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
     private String maktx;
 
-    @ApiModelProperty(value= "鎵瑰彿")
+    @ApiModelProperty(value= "搴忓垪鐮�")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -124,7 +123,7 @@
     private Integer source;
 
     @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
-    private Integer check;
+    private Integer inspect;
 
     @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
     private Integer danger;
@@ -155,6 +154,23 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @ApiModelProperty(value= "鏄惁鍐荤粨")
+    private Integer frozen;
+
+    /**
+     * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁}
+     */
+    @ApiModelProperty(value= "鐗╂枡绫诲瀷")
+    @TableField("mat_type")
+    private Integer matType;
+
+    @ApiModelProperty(value= "瀹㈡埛淇℃伅ID")
+    private Long owner;
+
+    @ApiModelProperty(value= "鐗╂枡绫诲瀷")
+    @TableField("mat_type_In")
+    private Integer matTypeIn;
+
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){
@@ -166,6 +182,16 @@
                 return String.valueOf(this.beBatch);
         }
     }
+
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
 
     public String getSource$(){
         if (null == this.source){ return null; }
@@ -181,15 +207,15 @@
         }
     }
 
-    public String getCheck$(){
-        if (null == this.check){ return null; }
-        switch (this.check){
+    public String getInspect$(){
+        if (null == this.inspect){ return null; }
+        switch (this.inspect){
             case 1:
                 return "鏄�";
             case 0:
                 return "鍚�";
             default:
-                return String.valueOf(this.check);
+                return String.valueOf(this.inspect);
         }
     }
 
@@ -219,23 +245,39 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
-    public void sync(Object dest) {
-        try {
-            BeanInfo sourceBean = Introspector.getBeanInfo(this.getClass(),Object.class);
-            PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
-            BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
-            PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
-            for (PropertyDescriptor propertyDescriptor : sourceProperty) {
-                for (PropertyDescriptor descriptor : destProperty) {
-                    if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) {
-                        descriptor.getWriteMethod().invoke(dest, propertyDescriptor.getReadMethod().invoke(this));
-                        break;
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage());
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
+
+    public String getMatType$() {
+        if (this.matType == null) {
+            return "";
+        }
+        switch (this.matType) {
+            case 1:
+                return "鍗曞搧";
+            case 2:
+                return "楂橀";
+            case 3:
+                return "娣锋斁";
+            default:
+                return "";
         }
     }
 
+    public String getMatTypeIn$() {
+        if (this.matTypeIn == null) {
+            return "榛樿";
+        }
+        switch (this.matTypeIn) {
+            case 1:
+                return "鍗曞搧";
+            case 2:
+                return "楂橀";
+            case 3:
+                return "娣锋斁";
+            default:
+                return "榛樿";
+        }
+    }
 }

--
Gitblit v1.9.1