From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 67 +++++++++++++++++++++++++++++----
1 files changed, 59 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 78580e2..c84e8c6 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,14 +86,20 @@
@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 = "鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_change)", example = "1")
+ @ExcelColumn(name="鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_change)")
+ private Integer unionChangeId;
@ApiModelProperty(value = "鍦ㄧ嚎绛剧珷鍚堝悓鍙�")
private String signApplyNo;
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
private Date validTime;
+ @ApiModelProperty(value = "瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ @ExcelColumn(name="瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ private Date delValidTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
@ExcelColumn(name="鎵瑰崟鍙�")
@@ -105,6 +112,14 @@
@ApiModelProperty(value = "鍙樻洿閲戦")
@ExcelColumn(name="鍙樻洿閲戦")
private BigDecimal fee;
+
+ @ApiModelProperty(value = "鍚堝苟鍗�-鎶曚繚鍗曠姸鎬� 0=鏈笂浼�;1=宸蹭笂浼�;2=宸茬缃�", example = "1")
+ private Integer unionChangeTbdStatus;
+
+ @ApiModelProperty(value = "浜哄憳鍚嶅崟绛剧讲鍚堝悓鍙�")
+ @ExcelColumn(name="浜哄憳鍚嶅崟绛剧讲鍚堝悓鍙�")
+ private String signMemberListNo;
+
@ApiModelProperty(value = "淇濆崟鍙�")
@TableField(exist = false)
private String applyCode;
@@ -135,6 +150,10 @@
@TableField(exist = false)
private Integer changeNum;
+ @ApiModelProperty(value = "鏈�鍚庝竴娆″姞鍑忎繚/鎹㈠巶鏃ユ湡")
+ @TableField(exist = false)
+ private Date lastChangeDate;
+
@ApiModelProperty(value = "鎻愪氦鏃ユ湡寮�濮� yyyy-MM-dd ")
@TableField(exist = false)
private String createDateS;
@@ -143,9 +162,30 @@
@TableField(exist = false)
private String createDateE;
+ @ApiModelProperty(value = "鎵瑰崟鐢熸晥璧锋湡鏃堕棿")
+ @TableField(exist = false)
+ private String applyStartS;
+
+ @ApiModelProperty(value = "鎵瑰崟姝㈡晥鏃堕棿")
+ @TableField(exist = false)
+ private String applyStartE;
+
@ApiModelProperty(value = "淇濋櫓鏂规涓婚敭")
@TableField(exist = false)
private Integer solutionsId;
+ @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭(鍩鸿〃锛�")
+ @TableField(exist = false)
+ private Integer baseSolutionsId;
+ @ApiModelProperty(value = "鐢宠鍗曢檮浠�")
+ @TableField(exist = false)
+ private Multifile applyFile;
+ @ApiModelProperty(value = "鐢宠鍗曟崲鍘傞檮浠�")
+ @TableField(exist = false)
+ private Multifile applyUnitFile;
+ @ApiModelProperty(value = "鎵瑰崟闄勪欢")
+ @TableField(exist = false)
+ private Multifile pidanFile;
+
@ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁")
@TableField(exist = false)
@@ -164,9 +204,6 @@
@TableField(exist = false)
private Integer companyId;
- @ApiModelProperty(value = "鎵瑰崟闄勪欢瀵硅薄")
- @TableField(exist = false)
- private Multifile pidanFile;
@ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵�� 0鍚屾剰 1椹冲洖")
@TableField(exist = false)
private int dealBackApply;
@@ -177,10 +214,22 @@
@ApiModelProperty(value = "淇濋櫓鐢熸晥姝㈡湡")
@TableField(exist = false)
private Date endTime;
+ @ApiModelProperty(value = "鏂规閭欢")
+ @TableField(exist = false)
+ private String solutionEmail;
+ @ApiModelProperty(value = "鏃ュ織璁板綍")
+ @TableField(exist = false)
+ private List<ApplyLog> applyLogList;
+ @ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
+ @TableField(exist = false)
+ private Integer solutionType;
+
+ @ApiModelProperty(value = "鍚堝苟鍗曚富閿紙淇濆崟锛�")
+ @TableField(exist = false)
+ private Integer unionApplyId;
-
- public TaxesInvoicingVO getTaxesInvoicingVO(){
+ public TaxesInvoicingVO toTaxesInvoicingVO(){
TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
taxesInvoicingVO.setId(this.getId());
taxesInvoicingVO.setSolutionsName(this.getSolutionsName());
@@ -191,5 +240,7 @@
taxesInvoicingVO.setType(Constants.ONE);
return taxesInvoicingVO;
}
-
+ @ApiModelProperty(value = "鏄惁鑾峰彇闄勪欢淇℃伅 0涓嶉渶瑕� 1闇�瑕�")
+ @TableField(exist = false)
+ private Integer getFiles;
}
--
Gitblit v1.9.3