From 601bb38a72ec10d43962cdcf1bd7b51835e8b011 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 18:32:45 +0800
Subject: [PATCH] 调整
---
server/service/src/main/java/com/doumee/dao/business/model/Taxes.java | 68 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java b/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java
index e0409cd..e02dcd8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Taxes.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,8 +9,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 鍙戠エ淇℃伅琛�
@@ -32,7 +36,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +45,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "寮�鎴疯")
@@ -56,13 +60,16 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖", example = "1")
- @ExcelColumn(name="鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖")
+ @ApiModelProperty(value = "鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖 3宸插啿绾�", example = "1")
+ @ExcelColumn(name="鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖3宸插啿绾�")
private Integer status;
@ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
@ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
private Integer companyId;
+ @ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
+ @ExcelColumn(name="鏂规缂栫爜锛坰olutions锛�")
+ private Integer solutionId;
@ApiModelProperty(value = "鎬婚噾棰�", example = "1")
@ExcelColumn(name="鎬婚噾棰�")
@@ -88,13 +95,25 @@
@ExcelColumn(name="鍙戠エ鎺ユ敹鍦板潃")
private String addr;
- @ApiModelProperty(value = "寮�绁ㄥ悕绉�")
- @ExcelColumn(name="寮�绁ㄥ悕绉�")
+ @ApiModelProperty(value = "鐢宠浼佷笟鍚嶇О")
+ @ExcelColumn(name="鐢宠浼佷笟鍚嶇О")
private String companyName;
@ApiModelProperty(value = "鍙戠エ鐢靛瓙鐗�")
@ExcelColumn(name="鍙戠エ鐢靛瓙鐗�")
private String imgurl;
+ @ApiModelProperty(value = "鍙戠エ鍙�")
+ @ExcelColumn(name="鍙戠エ鍙�")
+ private String doneCode;
+ @ApiModelProperty(value = "涓婁紶鍙戠エ澶囨敞")
+ @ExcelColumn(name="涓婁紶鍙戠エ澶囨敞")
+ private String doneInfo;
+ @ApiModelProperty(value = "涓婁紶鍙戠エ鏃堕棿")
+ @ExcelColumn(name="涓婁紶鍙戠エ鏃堕棿")
+ private Date doneDate;
+ @ApiModelProperty(value = "涓婁紶鍙戠エ鐢ㄦ埛缂栫爜")
+ @ExcelColumn(name="涓婁紶鍙戠エ鐢ㄦ埛缂栫爜")
+ private Integer doneUserId;
@ApiModelProperty(value = "鍗曟嵁绫诲瀷 0濮旀墭寮�绁� 1鐩翠繚", example = "1")
@ExcelColumn(name="鍗曟嵁绫诲瀷 0濮旀墭寮�绁� 1鐩翠繚")
@@ -102,7 +121,7 @@
@ApiModelProperty(value = "骞冲彴鎾ゅ洖鏃堕棿")
@ExcelColumn(name="骞冲彴鎾ゅ洖鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date cancelDate;
@ApiModelProperty(value = "鎾ゅ洖澶囨敞")
@@ -112,5 +131,40 @@
@ApiModelProperty(value = "鎾ゅ洖鎿嶄綔浜哄憳缂栫爜", example = "1")
@ExcelColumn(name="鎾ゅ洖鎿嶄綔浜哄憳缂栫爜")
private Integer cancelUserId;
+ @ApiModelProperty(value = "鍐茬孩鏃堕棿")
+ @ExcelColumn(name="鍐茬孩鏃堕棿")
+ private Date delDate;
+ @ApiModelProperty(value = "鍐茬孩澶囨敞")
+ @ExcelColumn(name="鍐茬孩澶囨敞")
+ private String delIInfo;
+
+ @ApiModelProperty(value = "鍐茬孩鎿嶄綔浜哄憳缂栫爜", example = "1")
+ @ExcelColumn(name="鍐茬孩鎿嶄綔浜哄憳缂栫爜")
+ private Integer delUserId;
+
+
+ @ApiModelProperty(value = "鐢宠浜�")
+ @TableField(exist = false)
+ private String creatorName;
+ @ApiModelProperty(value = "鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionName;
+ @ApiModelProperty(value = "鍙戠エ闄勪欢瀹屾暣鏄剧ず鍦板潃")
+ @TableField(exist = false)
+ private String imgurlFull;
+
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startDate;
+ @ApiModelProperty(value = "鏌ヨ鎴鏃堕棿")
+ @TableField(exist = false)
+ private Date endDate;
+
+ @ApiModelProperty(value = "鎶曚繚鍜屽姞鍑忎繚")
+ @TableField(exist = false)
+ List<TaxDetial> applyList;//
+ @ApiModelProperty(value = "鍐茬孩鍗曞垪琛�")
+ @TableField(exist = false)
+ List<TaxDetial> delTaxList ;//
}
--
Gitblit v1.9.3