From 3af951146aabb69d7857daf11a4bdef21c7ef77e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 22 五月 2024 09:54:29 +0800
Subject: [PATCH] 功能调整

---
 data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java |   62 ++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java b/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
index cd5080b..725792c 100644
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
+++ b/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
@@ -13,6 +13,7 @@
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -27,7 +28,7 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class FinanceSubmit implements Serializable {
+public class FinanceSubmit extends OrderBy implements Serializable {
 
     /**
     * 涓婚敭
@@ -37,6 +38,14 @@
     @TableId(type = IdType.AUTO)
     private Integer id;
     /**
+     * 浠ｇ悊鍏徃
+     */
+    @ValueTableShow
+    @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    @ApiModelProperty("浠ｇ悊鍟�")
+    @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    private String company;
+    /**
     * 璐︽埛鍚�
     */
     @ValueTableShow
@@ -45,50 +54,46 @@
     @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
     private String name;
     /**
-    * 浠ｇ悊鍏徃
-    */
-    @ValueTableShow
-    @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
-    @ApiModelProperty("浠ｇ悊鍏徃")
-    @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
-    private String company;
-    /**
     * 娑堣垂閲戦
     */
     @ValueTableShow
-    @ApiModelProperty("娑堣垂閲戦")
+    @ApiModelProperty("閲戦")
     private BigDecimal consumption;
     /**
-    * 鍏呭�奸噾棰�
-    */
-    @ValueTableShow
-    @ApiModelProperty("鍏呭�奸噾棰�")
-    private BigDecimal recharge;
-    /**
-    * 閫�娆鹃噾棰�
-    */
-    @ValueTableShow
-    @ApiModelProperty("閫�娆鹃噾棰�")
-    private BigDecimal refund;
-    /**
-    * 浠ｇ悊杩旂偣
-    */
+     * 浠ｇ悊杩旂偣
+     */
     @ValueTableShow
     @ApiModelProperty("浠ｇ悊杩旂偣")
     private BigDecimal agentRebate;
+    /**
+    * 鎵撴浜烘皯甯�
+    */
+    @ValueTableShow
+    @ApiModelProperty("鎵撴浜烘皯甯�")
+    private BigDecimal money;
+    /**
+    * 鍛樺伐杩旂偣
+    */
+    @ValueTableShow
+    @ApiModelProperty("鍛樺伐杩旂偣")
+    private BigDecimal employeeRebate;
+    /**
+     * 鍛樺伐杩旂偣浜烘皯甯�
+     */
+    @ValueTableShow
+    @ApiModelProperty("鍛樺伐杩旂偣浜烘皯甯�")
+    private BigDecimal employeeRebateMoney;
     /**
      * 鍒涘缓鏃堕棿
      */
     @ApiModelProperty("鐧昏鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ValueTableShow(6)
     private LocalDateTime createTime;
     /**
      *
      */
     @ApiModelProperty("绯荤粺鏃堕棿")
-    @ValueTableShow(0)
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
@@ -101,6 +106,7 @@
 
     @ValueTableShow(5)
     @ApiModelProperty("鐧昏浜�")
+    @TableField(exist = false)
     private String createUserName;
     /**
      *
@@ -109,5 +115,9 @@
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
+    private Integer dataId;
+
+    @TableField(select = false, exist = false)
+    private String param;
 
 }

--
Gitblit v1.9.3