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/Solutions.java |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
index 0a8201d..1643578 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.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;
@@ -10,11 +11,12 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 淇濋櫓鏂规淇℃伅琛�
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Data
 @ApiModel("淇濋櫓鏂规淇℃伅琛�")
@@ -32,7 +34,7 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +43,7 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -92,9 +94,9 @@
     @ExcelColumn(name="淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�")
     private Integer timeUnit;
 
-    @ApiModelProperty(value = "寮�鎴疯")
-    @ExcelColumn(name="寮�鎴疯")
-    private String insureCycle;
+    @ApiModelProperty(value = "鎶曚繚鍛ㄦ湡")
+    @ExcelColumn(name="鎶曚繚鍛ㄦ湡")
+    private Integer insureCycle;
 
     @ApiModelProperty(value = "鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
     @ExcelColumn(name="鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�")
@@ -111,6 +113,9 @@
     @ApiModelProperty(value = "鎺ユ敹鏂囦欢閭")
     @ExcelColumn(name="鎺ユ敹鏂囦欢閭")
     private String email;
+    @ApiModelProperty(value = "鎵垮寘鍏徃")
+    @ExcelColumn(name="鎵垮寘鍏徃")
+    private String companyName;
 
     @ApiModelProperty(value = "鐗瑰埆绾﹀畾")
     @ExcelColumn(name="鐗瑰埆绾﹀畾")
@@ -123,10 +128,10 @@
     @ApiModelProperty(value = "鍏朵粬璇存槑")
     @ExcelColumn(name="鍏朵粬璇存槑")
     private String ortherInfo;
+    @ApiModelProperty(value = "绛剧珷鍏抽敭瀛楋紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+    @ExcelColumn(name="绛剧珷鍏抽敭瀛楋紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+    private String signKeyword;
 
-    @ApiModelProperty(value = "鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)", example = "1")
-    @ExcelColumn(name="鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)")
-    private Integer solutionBaseId;
 
     @ApiModelProperty(value = "鐗堟湰鍙�")
     @ExcelColumn(name="鐗堟湰鍙�")
@@ -140,4 +145,30 @@
     @ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
     private Integer baseId;
 
+    @ApiModelProperty(value = "寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�", example = "1")
+    @ExcelColumn(name="寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�")
+    private Integer validTypeNum;
+
+    @ApiModelProperty(value = "鍛樺伐", example = "1")
+    @TableField(exist = false)
+    private Integer memberId;
+    @ApiModelProperty(value = "淇濋櫓鍏徃鍚嶇О", example = "1")
+    @TableField(exist = false)
+    private String insuranceName;
+
+    @ApiModelProperty(value = "淇濆崟涓婚敭", example = "1")
+    @TableField(exist = false)
+    private Integer applyId;
+
+    @ApiModelProperty(value = "宸ョ缂栫爜闆嗗悎", example = "1")
+    @TableField(exist = false)
+    private List<Integer> worktypeIdList;
+    @ApiModelProperty(value = "宸ョ鍏宠仈闆嗗悎", example = "1")
+    @TableField(exist = false)
+    private  List<SolutionWorktype> worktypeList;
+
+    @ApiModelProperty(value = "鎬诲懆鏈熻垂鐢�", example = "1")
+    @TableField(exist = false)
+    private BigDecimal cyclePrice;
+
 }

--
Gitblit v1.9.3