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/Solutions.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 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..ee6648f 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")
@@ -75,6 +77,9 @@
@ApiModelProperty(value = "绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚", example = "1")
@ExcelColumn(name="绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
private Integer type;
+ @ApiModelProperty(value = "濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany)", example = "1")
+ @ExcelColumn(name="濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany)")
+ private Integer shopId;
@ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
@ExcelColumn(name="鏈�浣庡勾榫�")
@@ -92,9 +97,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骞�")
@@ -112,6 +117,10 @@
@ExcelColumn(name="鎺ユ敹鏂囦欢閭")
private String email;
+ @ApiModelProperty(value = "鎵垮寘鍏徃")
+ @ExcelColumn(name="鎵垮寘鍏徃")
+ private String companyName;
+
@ApiModelProperty(value = "鐗瑰埆绾﹀畾")
@ExcelColumn(name="鐗瑰埆绾﹀畾")
private String specialAgreement;
@@ -123,10 +132,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 +149,36 @@
@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;
+ @ApiModelProperty(value = "濮旀墭鍟嗘埛鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String shopName;
+ @ApiModelProperty(value = "鏂规纭涔﹀璞�", example = "1")
+ @TableField(exist = false)
+ private Multifile fanganFile;
+
}
--
Gitblit v1.9.3