From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/Solutions.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 97 insertions(+), 13 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 fb0f70a..dc1c690 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
@@ -34,7 +34,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -43,7 +43,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -77,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="鏈�浣庡勾榫�")
@@ -85,26 +88,58 @@
@ApiModelProperty(value = "鏈�楂樺勾榫�", example = "1")
@ExcelColumn(name="鏈�楂樺勾榫�")
private Integer maxAge;
+ @ApiModelProperty(value = "鍏宠仈鐖剁骇鏂规缂栫爜锛堝叧鑱攕olutions_base锛�", example = "1")
+ @ExcelColumn(name="鍏宠仈鐖剁骇鏂规缂栫爜锛堝叧鑱攕olutions_base锛�")
+ private Integer parentId;
+ @ApiModelProperty(value = "鏄惁鏈夋淳閬ｅ崟浣� 0鏈� 1鏃�", example = "1")
+ @ExcelColumn(name="鏄惁鏈夋淳閬ｅ崟浣� 0鏈� 1鏃�")
+ private Integer hasDispatchUnit;
- @ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
+ @ApiModelProperty(value = "淇濋櫓璐圭敤锛堜汉锛� -- 淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
@ExcelColumn(name="淇濋櫓璐圭敤(浜�/澶╋級")
private BigDecimal price;
- @ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
+ @ApiModelProperty(value = " 鍛ㄦ湡鍗曚綅 0澶� 2鏈� 3瀛ｅ害 4鍗婂勾 5骞� -- 淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
@ExcelColumn(name="淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�")
private Integer timeUnit;
+ @ApiModelProperty(value = "濮旀墭鏂规绛剧珷鏂瑰紡 0浼佷笟绛剧讲鍟嗘埛涓婁紶鎶曚繚鍗� 1浼佷笟绛炬姇淇濈敵璇� 2浼佷笟鏃犻渶绛剧珷", example = "1")
+ @ExcelColumn(name="濮旀墭鏂规绛剧珷鏂瑰紡 0绛剧讲鍟嗘埛涓婁紶鎶曚繚鍗� 1绛炬姇淇濈敵璇� 2浼佷笟鏃犻渶绛剧珷")
+ private Integer signType;
+ @ApiModelProperty(value = "鏄惁闇�瑕佸瀹� 0涓嶉渶瑕� 1闇�瑕�", example = "1")
+ @ExcelColumn(name="鏄惁闇�瑕佸瀹� 0涓嶉渶瑕� 1闇�瑕�")
+ private Integer retrial;
@ApiModelProperty(value = "鎶曚繚鍛ㄦ湡")
@ExcelColumn(name="鎶曚繚鍛ㄦ湡")
private Integer insureCycle;
- @ApiModelProperty(value = "鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
+ @ApiModelProperty(value = "鎵规敼璁¤垂鍗曚綅 0澶� 1鍗婃湀 2鏈� 3瀛ｅ害 4鍗婂勾 5骞� -- 鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
@ExcelColumn(name="鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�")
private Integer insureCycleUnit;
+
+ @ApiModelProperty(value = "鏄惁鍙姞淇� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍙姞淇� 0鍚� 1鏄�")
+ private Integer canAdd;
+
+ @ApiModelProperty(value = "鏄惁鍙噺淇� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍙噺淇� 0鍚� 1鏄�")
+ private Integer canReduce;
+ @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�")
+ private Integer delOnlyReplace;
+ @ApiModelProperty(value = "鏄惁鍙淳閬ｅ崟浣� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍙洿鎹㈡淳閬ｅ崟浣� 0鍚� 1鏄�")
+ private Integer canChangeUnit;
@ApiModelProperty(value = "鏈�灏忚璐瑰懆鏈熸椂闂村崟浣� 0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
@ExcelColumn(name="鏈�灏忚璐瑰懆鏈熸椂闂村崟浣� 0澶� 1鍗婃湀 2鏈� 3骞�")
private Integer priceCycleUnit;
+ @ApiModelProperty(value = "鎵瑰鐢熸晥澶╂暟", example = "1")
+ @ExcelColumn(name="鎵瑰鐢熸晥澶╂暟")
+ private Integer addValidDays;
+ @ApiModelProperty(value = "鎵瑰噺鐢熸晥澶╂暟", example = "1")
+ @ExcelColumn(name="鎵瑰噺鐢熸晥澶╂暟")
+ private Integer delValidDays;
@ApiModelProperty(value = "鏄惁鍗曠嫭鎸囨淳宸ョ 0鍚� 1鍥�", example = "1")
@ExcelColumn(name="鏄惁鍗曠嫭鎸囨淳宸ョ 0鍚� 1鍥�")
@@ -113,6 +148,7 @@
@ApiModelProperty(value = "鎺ユ敹鏂囦欢閭")
@ExcelColumn(name="鎺ユ敹鏂囦欢閭")
private String email;
+
@ApiModelProperty(value = "鎵垮寘鍏徃")
@ExcelColumn(name="鎵垮寘鍏徃")
private String companyName;
@@ -128,26 +164,62 @@
@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="鐗堟湰鍙�")
private String version;
- @ApiModelProperty(value = "绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- @ExcelColumn(name="绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- private String signKeyword;
- @ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁", example = "1")
- @ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁")
+ @ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁 2鏈�鏂板惎鐢ㄧ増鏈�", example = "1")
+ @ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁 2鏈�鏂板惎鐢ㄧ増鏈�")
private Integer dataType;
@ApiModelProperty(value = "鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�", example = "1")
@ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
private Integer baseId;
+ @ApiModelProperty(value = "寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�", example = "1")
+ @ExcelColumn(name="寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�")
+ private Integer validTypeNum;
+
+ @ApiModelProperty(value = "鎵规敼鎻愰啋鏃堕棿 HH:mm")
+ @ExcelColumn(name="鎵规敼鎻愰啋鏃堕棿")
+ private String correctWarnTime;
+
+ @ApiModelProperty(value = "鐘舵�� 0寰呯绔� 1宸茬绔�", example = "1")
+ @TableField(exist = false)
+ private Integer signStatus;
+
+ @ApiModelProperty(value = "绛剧讲鏃堕棿", example = "1")
+ @TableField(exist = false)
+ private Date signDate;
+
+
+ @ApiModelProperty(value = "绛剧讲鍚庢枃浠跺湴鍧�", example = "1")
+ @TableField(exist = false)
+ private String fileSignUrl;
+
+ @ApiModelProperty(value = "绛剧讲浜�", example = "1")
+ @TableField(exist = false)
+ private String signUserName;
+
+ @ApiModelProperty(value = "浼佷笟鏂规琛ㄤ富閿紙company_solutions锛�", example = "1")
+ @TableField(exist = false)
+ private Integer companySolutionId;
+
+ @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)
@@ -156,5 +228,17 @@
@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;
+ @ApiModelProperty(value = "涓绘柟妗堝悕绉�", example = "1")
+ @TableField(exist = false)
+ private String solutionBaseName;
}
--
Gitblit v1.9.3