From ac1c48e5ae523ec6f62366542478bc5d451326a0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 22 一月 2024 18:18:21 +0800
Subject: [PATCH] 开发业务接口

---
 server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java |   93 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
index a9bd5ff..7ee93e8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,12 +9,15 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Data
 @ApiModel("鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃")
@@ -31,8 +35,20 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
+
+    @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
+    @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
+
+    private Date checkDate;
+
+    @ApiModelProperty(value = "鏈�杩戞搷浣滃娉�")
+    @ExcelColumn(name="鏈�杩戞搷浣滃娉�")
+    private String checkInfo;
+
+    @ApiModelProperty(value = "鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)", example = "1")
+    @ExcelColumn(name="鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)")
+    private Integer checkUserId;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
     @ExcelColumn(name="鏇存柊浜虹紪鐮�")
@@ -40,7 +56,7 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -65,16 +81,15 @@
 
     @ApiModelProperty(value = "鎵瑰崟鐢熸晥鏃堕棿")
     @ExcelColumn(name="鎵瑰崟鐢熸晥鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date applyStartTime;
 
-    @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇�")
-    @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇�")
-    private String status;
+    @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� 4骞冲彴鍚屾剰 5骞冲彴椹冲洖")
+    @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� 4骞冲彴鍚屾剰 5骞冲彴椹冲洖")
+    private Integer status;
 
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date validTime;
 
     @ApiModelProperty(value = "鎵瑰崟鍙�")
@@ -85,4 +100,66 @@
     @ExcelColumn(name="鎿嶄綔绫诲瀷 0鍔犲噺淇� 1鎹㈠巶")
     private Integer type;
 
+    @ApiModelProperty(value = "鍙樻洿閲戦")
+    @ExcelColumn(name="鍙樻洿閲戦")
+    private BigDecimal fee;
+    @ApiModelProperty(value = "淇濆崟鍙�")
+    @TableField(exist = false)
+    private String applyCode;
+
+    @ApiModelProperty(value = "浼佷笟鍚嶇О")
+    @TableField(exist = false)
+    private String companyName;
+
+
+    @ApiModelProperty(value = "鏂规鍚嶇О")
+    @TableField(exist = false)
+    private String solutionsName;
+
+
+    @ApiModelProperty(value = "鍔犱繚浜烘暟")
+    @TableField(exist = false)
+    private Integer addNum;
+
+    @ApiModelProperty(value = "鍙樻洿閲戦")
+    @TableField(exist = false)
+    private BigDecimal changeMoney;
+
+    @ApiModelProperty(value = "鍑忎繚浜烘暟")
+    @TableField(exist = false)
+    private Integer delNum;
+
+    @ApiModelProperty(value = "鎹㈠巶浜烘暟")
+    @TableField(exist = false)
+    private Integer changeNum;
+
+    @ApiModelProperty(value = "鎻愪氦鏃ユ湡寮�濮� yyyy-MM-dd ")
+    @TableField(exist = false)
+    private String createDateS;
+
+    @ApiModelProperty(value = "鎻愪氦鏃ユ湡缁撴潫  yyyy-MM-dd ")
+    @TableField(exist = false)
+    private String createDateE;
+
+    @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭")
+    @TableField(exist = false)
+    private Integer solutionsId;
+
+    @ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁")
+    @TableField(exist = false)
+    private List<ApplyChagneDetail> addDetailList;
+
+    @ApiModelProperty(value = "鍑忎繚鏄庣粏鏁版嵁")
+    @TableField(exist = false)
+    private List<ApplyChagneDetail> delDetailList;
+
+    @ApiModelProperty(value = "鎹㈠巶鏄庣粏鏁版嵁")
+    @TableField(exist = false)
+    private List<ApplyChagneDetail> changeDetailList;
+
+
+    @ApiModelProperty(value = "浼佷笟涓婚敭")
+    @TableField(exist = false)
+    private Integer companyId;
+
 }

--
Gitblit v1.9.3