From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 130 +++++++++++++------------------------------
1 files changed, 40 insertions(+), 90 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
index bacd303..ec2c36c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -1,32 +1,23 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.vincent.rsf.server.manager.service.CompanysService;
-import com.vincent.rsf.server.manager.service.ShipperService;
-import com.vincent.rsf.server.manager.service.WarehouseService;
-import io.swagger.annotations.Api;
-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.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.framework.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.vincent.rsf.framework.common.Cools;
-import com.vincent.rsf.framework.common.SpringUtils;
-import com.vincent.rsf.server.system.service.UserService;
-import com.vincent.rsf.server.system.entity.User;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.Objects;
@Data
+@Accessors(chain = true)
@TableName("man_warehouse_areas")
public class WarehouseAreas implements Serializable {
@@ -45,11 +36,17 @@
@ApiModelProperty("浠撳簱ID")
private Long warehouseId;
+ @TableField(exist = false)
+ private String warehouseId$;
+
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value= "涓氬姟绫诲瀷")
private String type;
+
+ @TableField(exist = false)
+ private String type$;
/**
* 鍚嶇О
@@ -69,11 +66,17 @@
@ApiModelProperty(value= "璐т富鏍囪瘑(*)")
private Long shipperId;
+ @TableField(exist = false)
+ private String shipperId$;
+
/**
* 渚涘簲鍟嗘爣璇�
*/
@ApiModelProperty(value= "渚涘簲鍟嗘爣璇�")
private Short supplierId;
+
+ @TableField(exist = false)
+ private String supplierId$;
/**
* 鍏佽璐熷簱瀛�(*) 0: 鍚� 1: 鏄�
@@ -100,6 +103,12 @@
private Integer status;
/**
+ * 鎺掑簭瀛楁
+ */
+ @ApiModelProperty(value= "鎺掑簭瀛楁")
+ private Integer sort;
+
+ /**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@@ -118,11 +127,14 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -132,11 +144,14 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -156,8 +171,8 @@
public WarehouseAreas() {}
- public WarehouseAreas(String uuid,String name,String code,Long shipperId,Short supplierId,Short flagMinus,Short flagLabelMange,Short flagMix,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.type = uuid;
+ public WarehouseAreas(String type,String name,String code,Long shipperId,Short supplierId,Short flagMinus,Short flagLabelMange,Short flagMix,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.type = type;
this.name = name;
this.code = code;
this.shipperId = shipperId;
@@ -173,53 +188,6 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
- }
-
-// WarehouseAreas warehouseAreas = new WarehouseAreas(
-// null, // 缂栧彿
-// null, // 鍚嶇О
-// null, // 缂栫爜
-// null, // 璐т富鏍囪瘑(*)
-// null, // 渚涘簲鍟嗘爣璇�
-// null, // 鍏佽璐熷簱瀛�(*)
-// null, // 鏄惁鏍囩绠＄悊(*)[闈炵┖]
-// null, // 鏀寔娣锋斁(*)[闈炵┖]
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
-
- public String getShipperId$(){
- CompanysService service = SpringUtils.getBean(CompanysService.class);
- Companys shipper = service.getById(this.shipperId);
- if (!Cools.isEmpty(shipper)){
- return String.valueOf(shipper.getName());
- }
- return null;
- }
-
- public String getWarehouseId$() {
- if (this.warehouseId == null) { return null; }
- WarehouseService warehouseService = SpringUtils.getBean(WarehouseService.class);
- Warehouse warehouse = warehouseService.getById(this.warehouseId);
- if (!Objects.isNull(warehouse)) {
- return warehouse.getName();
- }
- return null;
- }
-
- public String getSupplierId$() {
- CompanysService service = SpringUtils.getBean(CompanysService.class);
- Companys supplier = service.getById(this.supplierId);
- if (!Cools.isEmpty(supplier)){
- return String.valueOf(supplier.getName());
- }
- return null;
}
public String getFlagMinus$(){
@@ -270,29 +238,11 @@
}
}
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
}
public String getUpdateTime$(){
--
Gitblit v1.9.1