From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
index b1f4ee3..dbdf314 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.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,6 +11,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 鍚堝苟鎶曚繚鍗曚俊鎭〃
@@ -32,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +42,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -62,17 +62,14 @@
@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 = "鏈�杩戞搷浣滃娉�")
@@ -107,4 +104,54 @@
@ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛�")
private Integer solutionId;
+ @ApiModelProperty(value = "鍟嗘埛鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "琚繚闄╀汉浼佷笟鍚嶇О ,鍒嗗壊")
+ @TableField(exist = false)
+ private String companyNames;
+
+ @ApiModelProperty(value = "鏂规鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String solutionName;
+
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈�", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryStartTime;
+
+ @ApiModelProperty(value = "鏌ヨ缁撴潫鏃ユ湡", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryEndTime;
+
+ @ApiModelProperty(value = "鏈嶅姟澶╂暟")
+ @TableField(exist = false)
+ private Integer serviceDays;
+
+ @ApiModelProperty(value = "鎶曚繚浜烘暟")
+ @TableField(exist = false)
+ private Integer insureNum;
+ @ApiModelProperty(value = "鐘舵�佸悕绉�")
+ @TableField(exist = false)
+ private String statusInfo;
+
+
+ @ApiModelProperty(value = "鏃ュ織璁板綍")
+ @TableField(exist = false)
+ private List<ApplyLog> applyLogList;
+
+ @ApiModelProperty(value = "浜哄憳淇℃伅")
+ @TableField(exist = false)
+ private List<ApplyDetail> applyDetailList;
+
+ @ApiModelProperty(value = "鎶曚繚鍗曞璞�")
+ @TableField(exist = false)
+ private Multifile toubaodanFile;
+ @ApiModelProperty(value = "鎶曚繚鍗曪紙宸茬缃诧級瀵硅薄")
+ @TableField(exist = false)
+ private Multifile toubaodanSignedFile;
+ @ApiModelProperty(value = "淇濋櫓鍗曞璞�")
+ @TableField(exist = false)
+ private Multifile baoxiandanFile;
}
--
Gitblit v1.9.3