From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 09 四月 2024 09:03:01 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 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 a9025e9..a73def8 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 @@ -89,7 +89,9 @@ @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 = "鏈熸湜淇濋櫓鐢熸晥璧锋湡") @@ -111,6 +113,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; @@ -148,6 +158,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) @@ -199,6 +217,15 @@ @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 toTaxesInvoicingVO(){ TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO(); taxesInvoicingVO.setId(this.getId()); @@ -210,5 +237,7 @@ taxesInvoicingVO.setType(Constants.ONE); return taxesInvoicingVO; } - + @ApiModelProperty(value = "鏄惁鑾峰彇闄勪欢淇℃伅 0涓嶉渶瑕� 1闇�瑕�") + @TableField(exist = false) + private Integer getFiles; } -- Gitblit v1.9.3