From 6289ae44a4c24d431e871a9497017ffa94cef6c7 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期六, 06 四月 2024 17:50:35 +0800
Subject: [PATCH] 系统调整
---
data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java b/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
index 232eb34..02c1b29 100644
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
+++ b/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
@@ -9,8 +9,11 @@
import java.time.LocalDateTime;
import java.util.Date;
+import cn.hutool.core.annotation.Alias;
import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
@@ -18,6 +21,7 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
/**
@@ -27,6 +31,7 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
+@Accessors(chain = true)
public class DataReporting extends OrderBy implements Serializable {
/**
@@ -34,6 +39,7 @@
*/
@NotNull(message="[]涓嶈兘涓虹┖")
@ApiModelProperty("涓婚敭")
+ @TableId(type = IdType.AUTO)
private Integer id;
/**
* 鐧昏浜�
@@ -59,6 +65,21 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ValueTableShow(3)
private String name;
+
+ @ApiModelProperty("濮撳悕")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ValueTableShow(4)
+ private String name2;
+
+ /**
+ * 椤圭洰
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("椤圭洰")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ValueTableShow(4)
+ private String product;
+
/**
* 娓犻亾
*/
@@ -67,20 +88,18 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ValueTableShow(4)
private String channel;
- /**
- * 椤圭洰
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("椤圭洰")
+
+ @ApiModelProperty("浠ｇ悊鍟�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(5)
- private String product;
+ @ValueTableShow(4)
+ private String agent;
+
/**
* 灞曠幇閲�
*/
@ApiModelProperty("灞曠幇閲�")
@ValueTableShow(6)
- private Integer show;
+ private Integer showNum;
/**
* 鐐瑰嚮閲�
*/
@@ -144,7 +163,7 @@
/**
* 浠ｇ悊杩旂偣
*/
- @ApiModelProperty("浠ｇ悊杩旂偣")
+ @ApiModelProperty("鍛樺伐浠ｇ悊杩旂偣")
@ValueTableShow(17)
private BigDecimal agentRebate;
/**
@@ -153,16 +172,21 @@
@ApiModelProperty("瀹㈡埛杩旂偣")
@ValueTableShow(18)
private BigDecimal customerRebate;
+
+ @ApiModelProperty("寰俊鍙�")
+ @ValueTableShow(19)
+ private String vxCard;
+
/**
* 澶囩敤瀛楁
*/
- @ApiModelProperty("澶囩敤瀛楁")
+ @ApiModelProperty("鍋氳繘鏉�")
@ValueTableShow(23)
private BigDecimal remark;
/**
*
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("绯荤粺鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ValueTableShow(20)
@@ -170,7 +194,7 @@
/**
*
*/
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @ApiModelProperty("鐧昏鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ValueTableShow(21)
@@ -181,13 +205,15 @@
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("鍒涘缓鐢ㄦ埛")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String createUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
/**
*
*/
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("鏇存柊鐢ㄦ埛")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String updateUser;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
}
--
Gitblit v1.9.3