From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/Taxes.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 92 insertions(+), 8 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 04a4791..5959744 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,6 +1,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -8,13 +11,16 @@
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;
/**
* 鍙戠エ淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Data
@ApiModel("鍙戠エ淇℃伅琛�")
@@ -32,7 +38,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +47,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "寮�鎴疯")
@@ -56,13 +62,17 @@
@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 +98,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 +124,6 @@
@ApiModelProperty(value = "骞冲彴鎾ゅ洖鏃堕棿")
@ExcelColumn(name="骞冲彴鎾ゅ洖鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelDate;
@ApiModelProperty(value = "鎾ゅ洖澶囨敞")
@@ -112,5 +133,68 @@
@ApiModelProperty(value = "鎾ゅ洖鎿嶄綔浜哄憳缂栫爜", example = "1")
@ExcelColumn(name="鎾ゅ洖鎿嶄綔浜哄憳缂栫爜")
private Integer cancelUserId;
+ @ApiModelProperty(value = "鍐茬孩鏃堕棿")
+ @ExcelColumn(name="鍐茬孩鏃堕棿")
+ private Date delDate;
+
+ @ApiModelProperty(value = "鍐茬孩澶囨敞")
+ @ExcelColumn(name="鍐茬孩澶囨敞")
+ private String delInfo;
+
+ @ApiModelProperty(value = "鍐茬孩鎿嶄綔浜哄憳缂栫爜", example = "1")
+ @ExcelColumn(name="鍐茬孩鎿嶄綔浜哄憳缂栫爜")
+ private Integer delUerId;
+
+ @ApiModelProperty(value = "鍗曟嵁鐢宠缂栫爜锛堝叧鑱攊nsurance_apply锛�", example = "1")
+ @ExcelColumn(name="鍗曟嵁鐢宠缂栫爜锛堝叧鑱攊nsurance_apply锛�")
+ private Integer insuranceApplyId;
+
+ @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 String insuranceCode;
+ @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 ;//
+
+ @ApiModelProperty(value = "淇濆崟涓婚敭 - 鏌ヨ淇濆崟鐨勫紑绁ㄥ巻鍙茶褰�")
+ @TableField(exist = false)
+ private Integer applyId;
+
+ @ApiModelProperty(value = "鎾ゅ洖鎿嶄綔浜�")
+ @TableField(exist = false)
+ private String cancelUserName;
+
+ public TaxesInvoicingVO getTaxesInvoicingVO(){
+ TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
+ taxesInvoicingVO.setId(this.getId());
+ taxesInvoicingVO.setSolutionsName(this.getSolutionName());
+ taxesInvoicingVO.setInsuranceCode(this.getInsuranceCode());
+ taxesInvoicingVO.setDownCode(this.getDoneCode());
+ taxesInvoicingVO.setCreateTime(this.getCreateDate());
+ taxesInvoicingVO.setAmount(this.getPrice());
+ taxesInvoicingVO.setType(Constants.TWO);
+ return taxesInvoicingVO;
+ }
+
}
--
Gitblit v1.9.3