From 5bce819f4a418f9ae352eb105e33707de1e0c1ce Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 31 一月 2024 14:07:44 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 b788cdb..75d793f 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
@@ -11,6 +11,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -85,12 +86,18 @@
@ExcelColumn(name="鎵瑰崟鐢熸晥鏃堕棿")
private Date applyStartTime;
- @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� 4骞冲彴鍚屾剰 5骞冲彴椹冲洖")
- @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� 4骞冲彴鍚屾剰 5骞冲彴椹冲洖")
+ @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� (寰呯缃�) 4閫�鍥炵敵璇� (宸茬绔�) 5骞冲彴鍚屾剰锛堝凡閫�鍥烇級 6宸插叧闂� ")
+ @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� (寰呯缃�) 4閫�鍥炵敵璇� (宸茬绔�) 5骞冲彴鍚屾剰锛堝凡閫�鍥烇級 6宸插叧闂� ")
private Integer status;
+ @ApiModelProperty(value = "鍦ㄧ嚎绛剧珷鍚堝悓鍙�")
+ private String signApplyNo;
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
+ //鍏ュ弬
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ //鍑哄弬
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date validTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
@@ -146,6 +153,10 @@
@TableField(exist = false)
private Integer solutionsId;
+ @ApiModelProperty(value = "鍩鸿〃淇濋櫓鏂规涓婚敭")
+ @TableField(exist = false)
+ private Integer baseSolutionsId;
+
@ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁")
@TableField(exist = false)
private List<ApplyChagneDetail> addDetailList;
@@ -179,7 +190,8 @@
- public TaxesInvoicingVO getTaxesInvoicingVO(){
+
+ public TaxesInvoicingVO toTaxesInvoicingVO(){
TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
taxesInvoicingVO.setId(this.getId());
taxesInvoicingVO.setSolutionsName(this.getSolutionsName());
--
Gitblit v1.9.3