From e756af0f5bfd1addbd5d5c145441fb34aad91a28 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 13:55:58 +0800
Subject: [PATCH] 同步工控网

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java |   61 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java
index d205a13..f390a20 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java
@@ -2,46 +2,83 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Getter
 @Data
 @NoArgsConstructor
 @TableName(value = "nc_product_mix")
-public class ProductMix {
+public class ProductMix implements Serializable {
+    private static final long serialVersionUID = 1529244980533421687L;
     // id
-    private long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
     // 鐖剁骇 id
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "parent_id")
-    private long parentId;
+    private Long parentId;
     // 鍚嶇О
-    @TableField(value = "name")
-    private String name;
+    @TableField(value = "tree_name")
+    private String treeName;
     // code
-    @TableField(value = "code")
-    private String code;
+    @TableField(value = "tree_code")
+    private String treeCode;
     // 绫诲瀷
-    @TableField(value = "type")
-    private String type;
+    @TableField(value = "tree_type")
+    private Integer treeType;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    //灞曠ず鍚嶇О
+    private transient String label;
+
+    //绫诲瀷 鏂逛究鍓嶇灞曠ず
+    private transient Integer type;
 
     private transient List<ProductMix> children = new ArrayList<>();
 
-    public ProductMix(long id, long parentId, String name, String code, String type) {
+    public ProductMix(Long id, Long parentId, String treeName, String trrCode, Integer type, Date createTime) {
         this.id = id;
         this.parentId = parentId;
-        this.name = name;
-        this.code = code;
+        this.treeName = treeName;
+        this.treeCode = trrCode;
         this.type = type;
         this.children = new ArrayList<>();
+        this.label="["+ trrCode +"]"+ treeName;
+        this.createTime = createTime;
     }
 
     public void addChild(ProductMix child) {
         this.children.add(child);
     }
 
+
+    public ProductMix(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ProductMix{createTime=" + createTime + '}';
+    }
+
 }

--
Gitblit v1.9.3