From e9db3cc8e323e87215ea2a3d964eceac8d8d3e66 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期六, 10 一月 2026 09:02:25 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
index 5800467..66d873c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
@@ -1,16 +1,16 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,9 +20,11 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
@Data
@TableName("man_matnr_group")
+@ApiModel(value = "MatnrGroup", description = "鐗╂枡鍒嗙被淇℃伅")
public class MatnrGroup implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,21 +37,21 @@
private Long id;
/**
- * 鏍囪瘑
- */
- @ApiModelProperty(value= "鏍囪瘑")
- private String uuid;
-
- /**
* 鍚嶇О
*/
@ApiModelProperty(value= "鍚嶇О")
private String name;
/**
+ * 鍒嗙粍缂栫爜
+ */
+ @ApiModelProperty("涓婄骇鍒嗙粍缂栫爜")
+ private String parCode;
+
+ /**
* 鐗╂枡缂栫爜
*/
- @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @ApiModelProperty(value= "鍒嗙粍缂栫爜")
private String code;
/**
@@ -57,6 +59,8 @@
*/
@ApiModelProperty(value= "涓婄骇鍒嗙被ID")
private Long parentId;
+
+ private Integer sort;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -88,6 +92,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -101,6 +106,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -109,10 +115,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value = "瀛愮被")
+ @TableField(exist = false)
+ private List<MatnrGroup> children;
+
public MatnrGroup() {}
- public MatnrGroup(String uuid,String name,String code,Long parentId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
+ public MatnrGroup(String name,String code,Long parentId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.name = name;
this.code = code;
this.parentId = parentId;
@@ -199,4 +208,8 @@
}
}
+ public String getLabel(){
+ return this.name;
+ }
+
}
--
Gitblit v1.9.1