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/ApplyChange.java | 29 ++++++++++++++++++++++++----- 1 files changed, 24 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 51592ae..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="鎵瑰崟鍙�") @@ -183,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) @@ -224,11 +232,22 @@ @ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚") @TableField(exist = false) private Integer solutionType; + @ApiModelProperty(value = "鏄惁鏈夋淳閬e崟浣� 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(); -- Gitblit v1.9.3