From 896cb061fbef0e4805bd1e40dc63cd0239070431 Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期四, 14 十二月 2023 16:40:01 +0800
Subject: [PATCH] 员工列表

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java |   59 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
index 98b82af..1bcb540 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.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;
@@ -22,53 +23,77 @@
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
-    @ExcelColumn(name="涓婚敭")
     private Integer id;
 
     @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
-    @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
     private String creator;
 
-    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date createDate;
+
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
-    @ExcelColumn(name="鏇存柊浜虹紪鐮�")
     private String edirot;
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
-    @ExcelColumn(name="鏇存柊鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     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 memberId;
 
     @ApiModelProperty(value = "鏈夋晥鏈熷紑濮�")
-    @ExcelColumn(name="鏈夋晥鏈熷紑濮�")
     private Date startTime;
 
-    @ApiModelProperty(value = "鏈夋晥鏈熺粨鏉�", example = "1")
-    @ExcelColumn(name="鏈夋晥鏈熺粨鏉�")
-    private Date endTime;
+
 
     @ApiModelProperty(value = "瀵煎叆鐘舵��", example = "1")
-    @ExcelColumn(name="瀵煎叆鐘舵��")
     private Integer importStatus;
 
     @ApiModelProperty(value = "瀵煎叆澶囨敞")
-    @ExcelColumn(name="瀵煎叆澶囨敞")
     private String importInfo;
 
+
+
+    @ApiModelProperty(value = "濮撳悕")
+    @TableField(exist = false)
+    @ExcelColumn(name="濮撳悕", index = 1)
+    private String name;
+
+    @ApiModelProperty(value = "鎵嬫満鍙�")
+    @TableField(exist = false)
+    @ExcelColumn(name="鎵嬫満鍙�", index = 2)
+    private String phone;
+
+    @ApiModelProperty(value = "韬唤璇�")
+    @TableField(exist = false)
+    @ExcelColumn(name="韬唤璇�", index = 3)
+    private String idcardNo;
+
+
+
+    @ApiModelProperty(value = "缁勭粐鍚嶇О")
+    @TableField(exist = false)
+    @ExcelColumn(name="鎵�灞炲叕鍙�", index = 4)
+    private String companyName;
+
+    @ApiModelProperty(value = "鎿嶄綔浜�")
+    @TableField(exist = false)
+    @ExcelColumn(name="鎿嶄綔浜�", index = 5)
+    private String createName;
+
+    @ApiModelProperty(value = "鍩硅鏃堕棿鑷�", example = "1")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ExcelColumn(name="鍩硅鏃堕棿鑷�", index = 6 ,dateFormat="yyyy-MM-dd")
+    private Date endTime;
+
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ExcelColumn(name="鎿嶄綔鏃堕棿", index = 7 ,dateFormat="yyyy-MM-dd")
+    private Date createDate;
+
 }

--
Gitblit v1.9.3