From c8ad6f13c0e9cbff9a0763bc50c86576449f6e03 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 一月 2024 08:57:51 +0800
Subject: [PATCH] 111

---
 server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 43 insertions(+), 8 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 e651059..65ab2a4 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
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,12 +9,15 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
+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,7 +35,7 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +44,7 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -65,27 +69,27 @@
 
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date applyEndTime;
 
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date applyStartTime;
 
     @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
     @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date endTime;
 
     @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date startTime;
 
     @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
     @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date checkDate;
 
     @ApiModelProperty(value = "鏈�杩戞搷浣滃娉�")
@@ -104,4 +108,35 @@
     @ExcelColumn(name="鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級  3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴  锛堝凡鍏抽棴锛�")
     private Integer status;
 
+    @ApiModelProperty(value = "褰撳墠璐圭敤")
+    @ExcelColumn(name="褰撳墠璐圭敤")
+    private BigDecimal currentFee;
+
+    @ApiModelProperty(value = "鎬昏垂鐢�")
+    @ExcelColumn(name="鎬昏垂鐢�")
+    private BigDecimal fee;
+
+    @ApiModelProperty(value = "浼佷笟鍚嶇О")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "鏂规鍚嶇О")
+    @TableField(exist = false)
+    private String solutionsName;
+
+    @ApiModelProperty(value = "浜哄憳淇℃伅")
+    @TableField(exist = false)
+    private List<ApplyDetail> applyDetailList;
+
+    @ApiModelProperty(value = "鎶曚繚浜烘暟")
+    @TableField(exist = false)
+    private Integer insureNum;
+
+    @ApiModelProperty(value = "鏈嶅姟澶╂暟")
+    @TableField(exist = false)
+    private Integer serviceDays;
+
+    @ApiModelProperty(value = "鏃ュ織璁板綍")
+    @TableField(exist = false)
+    private List<ApplyLog> applyLogList;
 }

--
Gitblit v1.9.3