From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 196 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 187 insertions(+), 9 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 a9bd5ff..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
@@ -1,6 +1,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -8,12 +11,16 @@
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;
+import java.util.List;
/**
* 鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Data
@ApiModel("鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃")
@@ -31,8 +38,20 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
+
+ @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
+ @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
+
+ private Date checkDate;
+
+ @ApiModelProperty(value = "鏈�杩戞搷浣滃娉�")
+ @ExcelColumn(name="鏈�杩戞搷浣滃娉�")
+ private String checkInfo;
+
+ @ApiModelProperty(value = "鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)", example = "1")
+ @ExcelColumn(name="鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)")
+ private Integer checkUserId;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
@@ -40,7 +59,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -65,17 +84,22 @@
@ApiModelProperty(value = "鎵瑰崟鐢熸晥鏃堕棿")
@ExcelColumn(name="鎵瑰崟鐢熸晥鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date applyStartTime;
- @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇�")
- @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇�")
- private String status;
-
+ @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="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date validTime;
+ @ApiModelProperty(value = "瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ @ExcelColumn(name="瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ private Date delValidTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
@ExcelColumn(name="鎵瑰崟鍙�")
@@ -85,4 +109,158 @@
@ExcelColumn(name="鎿嶄綔绫诲瀷 0鍔犲噺淇� 1鎹㈠巶")
private Integer type;
+ @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;
+
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+
+
+ @ApiModelProperty(value = "鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionsName;
+
+
+ @ApiModelProperty(value = "鍔犱繚浜烘暟")
+ @TableField(exist = false)
+ private Integer addNum;
+
+ @ApiModelProperty(value = "鍙樻洿閲戦")
+ @TableField(exist = false)
+ private BigDecimal changeMoney;
+
+ @ApiModelProperty(value = "鍑忎繚浜烘暟")
+ @TableField(exist = false)
+ private Integer delNum;
+
+ @ApiModelProperty(value = "鎹㈠巶浜烘暟")
+ @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;
+
+ @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)
+ 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)
+ private List<Multifile> pidanFileList;
+
+
+ @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer delOnlyReplace;
+
+ @ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁")
+ @TableField(exist = false)
+ private List<ApplyChagneDetail> addDetailList;
+
+ @ApiModelProperty(value = "鍑忎繚鏄庣粏鏁版嵁")
+ @TableField(exist = false)
+ private List<ApplyChagneDetail> delDetailList;
+
+ @ApiModelProperty(value = "鎹㈠巶鏄庣粏鏁版嵁")
+ @TableField(exist = false)
+ private List<ApplyChagneDetail> changeDetailList;
+
+
+ @ApiModelProperty(value = "浼佷笟涓婚敭")
+ @TableField(exist = false)
+ private Integer companyId;
+
+ @ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵�� 0鍚屾剰 1椹冲洖")
+ @TableField(exist = false)
+ private int dealBackApply;
+
+ @ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡")
+ @TableField(exist = false)
+ private Date startTime;
+ @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 = "鏄惁鏈夋淳閬ｅ崟浣� 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());
+ taxesInvoicingVO.setSolutionsName(this.getSolutionsName());
+ taxesInvoicingVO.setValidCode(this.getValidCode());
+ taxesInvoicingVO.setAddNum(this.getAddNum());
+ taxesInvoicingVO.setDelNum(this.getDelNum());
+ taxesInvoicingVO.setAmount(this.getFee());
+ taxesInvoicingVO.setType(Constants.ONE);
+ return taxesInvoicingVO;
+ }
+ @ApiModelProperty(value = "鏄惁鑾峰彇闄勪欢淇℃伅 0涓嶉渶瑕� 1闇�瑕�")
+ @TableField(exist = false)
+ private Integer getFiles;
}
--
Gitblit v1.9.3