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 |   86 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 4 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 7ee93e8..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
@@ -2,6 +2,8 @@
 
 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;
@@ -9,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;
@@ -81,15 +84,22 @@
 
     @ApiModelProperty(value = "鎵瑰崟鐢熸晥鏃堕棿")
     @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="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
+    //鍏ュ弬
+//     @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    //鍑哄弬
+//    @JsonFormat(pattern="yyyy-MM-dd")
     private Date validTime;
 
     @ApiModelProperty(value = "鎵瑰崟鍙�")
@@ -103,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;
@@ -141,9 +159,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)
@@ -162,4 +201,43 @@
     @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 = "鍚堝苟鍗曚富閿紙淇濆崟锛�")
+    @TableField(exist = false)
+    private Integer unionApplyId;
+
+
+    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