From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/Member.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Member.java b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
index 4f9ce76..1fa8b42 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -47,22 +49,22 @@
private Integer sortnum;
@ApiModelProperty(value = "濮撳悕")
- @ExcelColumn(name="鍛樺伐鍚嶇О",index = 2)
+ @ExcelColumn(name="鍛樺伐鍚嶇О",index = 2,width = 6)
private String name;
@ApiModelProperty(value = "鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply", example = "1")
private Integer applyId;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 9)
+ @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 9,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index = 8)
+ @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index = 8,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date startTime;
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
- @ExcelColumn(name="韬唤璇佸彿",index = 3)
+ @ExcelColumn(name="韬唤璇佸彿",index = 3,width = 12)
private String idcardNo;
@ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
@@ -78,17 +80,17 @@
private Integer sex;
@ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
- @ExcelColumn(name="淇濋櫓鏂规",index = 5)
+ @ExcelColumn(name="淇濋櫓鏂规",index = 5,width = 10)
@TableField(exist = false)
private String solutionName;
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
- @ExcelColumn(name="娲鹃仯鍗曚綅",index = 6)
+ @ExcelColumn(name="娲鹃仯鍗曚綅",index = 6,width = 10)
@TableField(exist = false)
private String duName;
@ApiModelProperty(value = "鎵�灞炲伐绉嶅悕绉�")
- @ExcelColumn(name="鎵�灞炲伐绉�",index = 7)
+ @ExcelColumn(name="鎵�灞炲伐绉�",index = 7,width = 20)
@TableField(exist = false)
private String workTypeName;
@@ -97,18 +99,39 @@
private String companyName;
@ApiModelProperty(value = "淇濋櫓鐘舵��:1=淇濋殰涓�;2=涓嶅湪淇�")
- @ExcelColumn(name="淇濋櫓鐘舵��",index = 1,valueMapping = "1=淇濋殰涓�;2=涓嶅湪淇�;")
+ @ExcelColumn(name="淇濋櫓鐘舵��",index = 1,valueMapping = "1=淇濋殰涓�;2=涓嶅湪淇�;",width = 6)
@TableField(exist = false)
private Integer solutionsStatus;
@ApiModelProperty(value = "骞撮緞")
- @ExcelColumn(name="骞撮緞",index = 4)
+ @ExcelColumn(name="骞撮緞",index = 4,width = 4)
@TableField(exist = false)
private Long age;
@ApiModelProperty(value = "搴忓彿", example = "1")
- @ExcelColumn(name="搴忓彿",index = 0)
+ @ExcelColumn(name="搴忓彿",index = 0,width = 4)
@TableField(exist = false)
private Integer sn;
+
+ @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭")
+ @TableField(exist = false)
+ private Integer solutionId;
+
+ @ApiModelProperty(value = "璐圭敤")
+ @TableField(exist = false)
+ private BigDecimal fee;
+
+ @ApiModelProperty(value = "淇濆崟鏄庣粏琛屽疄闄呭紑濮嬫棩鏈�")
+ @TableField(exist = false)
+ private Date detailStartTime;
+
+ @ApiModelProperty(value = "淇濆崟鏄庣粏琛屽疄闄呯粨鏉熸棩鏈�")
+ @TableField(exist = false)
+ private Date detailEndTime;
+
+ @ApiModelProperty(value = "淇濆崟鏄庣粏琛屾湇鍔¤垂")
+ @TableField(exist = false)
+ private BigDecimal detailServerCost;
+
}
--
Gitblit v1.9.3