From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/Taxes.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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 e02dcd8..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
@@ -2,6 +2,8 @@
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;
@@ -61,12 +63,13 @@
private String remark;
@ApiModelProperty(value = "鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖 3宸插啿绾�", example = "1")
- @ExcelColumn(name="鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖3宸插啿绾�")
+ @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;
@@ -121,7 +124,6 @@
@ApiModelProperty(value = "骞冲彴鎾ゅ洖鏃堕棿")
@ExcelColumn(name="骞冲彴鎾ゅ洖鏃堕棿")
-
private Date cancelDate;
@ApiModelProperty(value = "鎾ゅ洖澶囨敞")
@@ -137,12 +139,15 @@
@ApiModelProperty(value = "鍐茬孩澶囨敞")
@ExcelColumn(name="鍐茬孩澶囨敞")
- private String delIInfo;
+ private String delInfo;
@ApiModelProperty(value = "鍐茬孩鎿嶄綔浜哄憳缂栫爜", example = "1")
@ExcelColumn(name="鍐茬孩鎿嶄綔浜哄憳缂栫爜")
- private Integer delUserId;
+ private Integer delUerId;
+ @ApiModelProperty(value = "鍗曟嵁鐢宠缂栫爜锛堝叧鑱攊nsurance_apply锛�", example = "1")
+ @ExcelColumn(name="鍗曟嵁鐢宠缂栫爜锛堝叧鑱攊nsurance_apply锛�")
+ private Integer insuranceApplyId;
@ApiModelProperty(value = "鐢宠浜�")
@TableField(exist = false)
@@ -154,6 +159,9 @@
@TableField(exist = false)
private String imgurlFull;
+ @ApiModelProperty(value = "淇濆崟鍙�")
+ @TableField(exist = false)
+ private String insuranceCode;
@ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂�")
@TableField(exist = false)
private Date startDate;
@@ -167,4 +175,26 @@
@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