From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 02 四月 2024 17:05:57 +0800
Subject: [PATCH] mrshi

---
 server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 20ca2e1..8732783 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -38,7 +38,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -47,7 +46,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -72,21 +70,26 @@
 
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
-
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//     @JsonFormat(pattern="yyyy-MM-dd")
     private Date applyEndTime;
 
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
-
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern="yyyy-MM-dd")
     private Date applyStartTime;
 
     @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
     @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
-
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern="yyyy-MM-dd")
     private Date endTime;
 
     @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern="yyyy-MM-dd")
     private Date startTime;
 
     @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@@ -128,6 +131,12 @@
     @ApiModelProperty(value = "鏂规鍚嶇О")
     @TableField(exist = false)
     private String solutionsName;
+    @ApiModelProperty(value = "鏂规閭欢")
+    @TableField(exist = false)
+    private String solutionEmail;
+    @ApiModelProperty(value = "绛剧珷鍏抽敭瀛�")
+    @TableField(exist = false)
+    private String signKeyword;
 
     @ApiModelProperty(value = "浜哄憳淇℃伅")
     @TableField(exist = false)
@@ -170,14 +179,41 @@
     @ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵��  0鍚屾剰 1椹冲洖")
     @TableField(exist = false)
     private int dealBackApply;
-    @ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1寰呭嚭鍗� 2淇濋殰涓�  3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
+    @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1寰呭嚭鍗� 2淇濋殰涓�  3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
     @TableField(exist = false)
     private Integer statusCollect;
+    @ApiModelProperty(value = "闆嗗悎鐘舵��" , example = "1")
+    @TableField(exist = false)
+    private String statusInfo;
+
+    @ApiModelProperty(value = "鏈�鍚庝竴娆″姞鍑忎繚/鎹㈠巶鏃ユ湡")
+    @TableField(exist = false)
+    private Date lastChangeDate;
 
 
+    @ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
+    @TableField(exist = false)
+    private Integer minAge;
+
+    @ApiModelProperty(value = "鏈�楂樺勾榫�", example = "1")
+    @TableField(exist = false)
+    private Integer maxAge;
 
 
-    public TaxesInvoicingVO getTaxesInvoicingVO(){
+    @ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
+    @TableField(exist = false)
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
+    @TableField(exist = false)
+    private Integer timeUnit;
+
+
+    @ApiModelProperty(value = "鏈�鏂扮増鏈殑鏂规涓婚敭", example = "1")
+    @TableField(exist = false)
+    private Integer newVersionSolutionId;
+
+    public TaxesInvoicingVO toTaxesInvoicingVO(){
         TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
         taxesInvoicingVO.setId(this.getId());
         taxesInvoicingVO.setSolutionsName(this.getSolutionsName());

--
Gitblit v1.9.3