From e6ff15690bf92e4c942f279d95cabe726d3cd56a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 六月 2025 15:26:35 +0800
Subject: [PATCH] 提交一把订单
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 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 f9a1963..3e67a4c 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
@@ -96,11 +96,10 @@
private String signApplyNo;
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
- //鍏ュ弬
-// @DateTimeFormat(pattern = "yyyy-MM-dd")
-// //鍑哄弬
-// @JsonFormat(pattern="yyyy-MM-dd")
private Date validTime;
+ @ApiModelProperty(value = "瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ @ExcelColumn(name="瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ private Date delValidTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
@ExcelColumn(name="鎵瑰崟鍙�")
@@ -113,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;
@@ -143,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;
@@ -150,6 +161,14 @@
@ApiModelProperty(value = "鎻愪氦鏃ユ湡缁撴潫 yyyy-MM-dd ")
@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)
@@ -163,10 +182,19 @@
@ApiModelProperty(value = "鐢宠鍗曟崲鍘傞檮浠�")
@TableField(exist = false)
private Multifile applyUnitFile;
+
@ApiModelProperty(value = "鎵瑰崟闄勪欢")
@TableField(exist = false)
private Multifile pidanFile;
+ @ApiModelProperty(value = "鎵瑰崟闄勪欢鍒楄〃")
+ @TableField(exist = false)
+ private List<Multifile> pidanFileList;
+
+
+ @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer delOnlyReplace;
@ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁")
@TableField(exist = false)
@@ -201,6 +229,26 @@
@ApiModelProperty(value = "鏃ュ織璁板綍")
@TableField(exist = false)
private List<ApplyLog> applyLogList;
+ @ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
+ @TableField(exist = false)
+ private Integer solutionType;
+ @ApiModelProperty(value = "鏄惁鏈夋淳閬ｅ崟浣� 0鏈� 1鏃�", example = "1")
+ @TableField(exist = false)
+ private Integer hasDispatchUnit;
+
+ @ApiModelProperty(value = "鍚堝苟鍗曚富閿紙淇濆崟锛�")
+ @TableField(exist = false)
+ private Integer unionApplyId;
+ @ApiModelProperty(value = "骞翠唤")
+ @TableField(exist = false)
+ private Integer year;
+ @ApiModelProperty(value = "缁熻鏉＄洰鏁�")
+ @TableField(exist = false)
+ private Integer countNum;
+ @ApiModelProperty(value = "鎻愪氦鏃ユ湡寮�濮� yyyy-MM ")
+ @TableField(exist = false)
+ private String month;
+
public TaxesInvoicingVO toTaxesInvoicingVO(){
TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
taxesInvoicingVO.setId(this.getId());
@@ -212,5 +260,7 @@
taxesInvoicingVO.setType(Constants.ONE);
return taxesInvoicingVO;
}
-
+ @ApiModelProperty(value = "鏄惁鑾峰彇闄勪欢淇℃伅 0涓嶉渶瑕� 1闇�瑕�")
+ @TableField(exist = false)
+ private Integer getFiles;
}
--
Gitblit v1.9.3