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/Member.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 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 3d0d6fd..beba41d 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
@@ -23,85 +23,92 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
-
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "濮撳悕")
- @ExcelColumn(name="濮撳悕")
+ @ExcelColumn(name="鍛樺伐鍚嶇О",index = 2,width = 6)
private String name;
@ApiModelProperty(value = "鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply", example = "1")
- @ExcelColumn(name="鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply")
private Integer applyId;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- private String endTime;
+ @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 9,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
- @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
- private String startTime;
+ @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index = 8,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
- @ExcelColumn(name="韬唤璇佸彿鐮�")
+ @ExcelColumn(name="韬唤璇佸彿",index = 3,width = 12)
private String idcardNo;
@ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
- @ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
private Integer companyId;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
- @ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
private Integer duId;
@ApiModelProperty(value = "宸ョ缂栫爜", example = "1")
- @ExcelColumn(name="宸ョ缂栫爜")
private Integer worktypeId;
@ApiModelProperty(value = "鎬у埆 0鐢� 1濂�", example = "1")
- @ExcelColumn(name="鎬у埆 0鐢� 1濂�")
private Integer sex;
@ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
+ @ExcelColumn(name="淇濋櫓鏂规",index = 5,width = 10)
@TableField(exist = false)
private String solutionName;
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
+ @ExcelColumn(name="娲鹃仯鍗曚綅",index = 6,width = 10)
@TableField(exist = false)
private String duName;
@ApiModelProperty(value = "鎵�灞炲伐绉嶅悕绉�")
+ @ExcelColumn(name="鎵�灞炲伐绉�",index = 7,width = 20)
@TableField(exist = false)
private String workTypeName;
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+
+ @ApiModelProperty(value = "淇濋櫓鐘舵��:1=淇濋殰涓�;2=涓嶅湪淇�")
+ @ExcelColumn(name="淇濋櫓鐘舵��",index = 1,valueMapping = "1=淇濋殰涓�;2=涓嶅湪淇�;",width = 6)
+ @TableField(exist = false)
+ private Integer solutionsStatus;
+
+ @ApiModelProperty(value = "骞撮緞")
+ @ExcelColumn(name="骞撮緞",index = 4,width = 4)
+ @TableField(exist = false)
+ private Long age;
+
+ @ApiModelProperty(value = "搴忓彿", example = "1")
+ @ExcelColumn(name="搴忓彿",index = 0,width = 4)
+ @TableField(exist = false)
+ private Integer sn;
+
}
--
Gitblit v1.9.3