Merge branch 'mdc_hyjs_master'

zhangherong

2025-06-25 23855599412c4d61b38d78f0f3abd3430a48b5b1

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java

对比新文件
@@ -0,0 +1,83 @@
package org.jeecg.modules.dnc.entity;

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.NoArgsConstructor;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@Data
@NoArgsConstructor
@TableName(value = "nc_product_mix")
public class ProductMix implements Serializable {
    private static final long serialVersionUID = 1529244980533421687L;
    // id
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    // 鐖剁骇 id
    @JsonSerialize(using = ToStringSerializer.class)
    @TableField(value = "parent_id")
    private Long parentId;
    // 鍚嶇О
    @TableField(value = "tree_name")
    private String treeName;
    // code
    @TableField(value = "tree_code")
    private String treeCode;
    // 绫诲瀷
    @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 treeName, String treeCode, Integer type, Date createTime) {
        this.id = id;
        this.parentId = parentId;
        this.treeName = treeName;
        this.treeCode = treeCode;
        this.type = type;
        this.children = new ArrayList<>();
        this.label="["+treeCode+"]"+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 + '}';
    }

}