From cf28a6bc97dbb2589151c5365a129b835991319f Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期一, 18 十二月 2023 10:09:03 +0800
Subject: [PATCH] 员工列表

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java |  112 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index 41e5093..a174a5c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.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,95 +23,130 @@
 
     @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 String hkId;
 
     @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
-    @ExcelColumn(name="鎺掑簭鐮�")
     private Integer sortnum;
 
     @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 = "涓嬪彂鐘舵�� 0寰呬笅鍙� 1宸蹭笅鍙� 2宸插彇娑�", example = "1")
-    @ExcelColumn(name="涓嬪彂鐘舵�� 0寰呬笅鍙� 1宸蹭笅鍙� 2宸插彇娑�")
-    private Integer sendStatus;
 
-    @ApiModelProperty(value = "涓嬪彂绫诲瀷 0瀹炴椂 1瀹氭椂 ", example = "1")
-    @ExcelColumn(name="涓嬪彂绫诲瀷 0瀹炴椂 1瀹氭椂 ")
-    private Integer sendType;
 
-    @ApiModelProperty(value = "涓嬪彂澶囨敞")
-    @ExcelColumn(name="涓嬪彂澶囨敞")
-    private String sendInfo;
 
-    @ApiModelProperty(value = "涓嬪彂鏃堕棿")
-    @ExcelColumn(name="涓嬪彂鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date sendDate;
 
     @ApiModelProperty(value = "涓嬪彂浜哄憳", example = "1")
-    @ExcelColumn(name="涓嬪彂浜哄憳")
     private Integer sendUserId;
 
     @ApiModelProperty(value = "鍙栨秷浜哄憳", example = "1")
-    @ExcelColumn(name="鍙栨秷浜哄憳")
     private Integer cancelUserId;
 
     @ApiModelProperty(value = "鍙栨秷鏃堕棿")
-    @ExcelColumn(name="鍙栨秷鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date cancelDate;
 
     @ApiModelProperty(value = "鍙栨秷澶囨敞")
-    @ExcelColumn(name="鍙栨秷澶囨敞")
     private String cANCElInfo;
 
+    @ApiModelProperty(value = "鎵�灞炲叕鍙哥紪鐮�")
+    @TableField(exist = false)
+    private String companyId;
+
+    @ApiModelProperty(value = "濮撳悕")
+    @ExcelColumn(name="濮撳悕",index = 1)
+    @TableField(exist = false)
+    private String memberName;
+
+    @ApiModelProperty(value = "鎵嬫満鍙�")
+    @ExcelColumn(name="鎵嬫満鍙�" ,index = 2)
+    @TableField(exist = false)
+    private String memberPhone;
+
+    @ApiModelProperty(value = "韬唤璇�")
+    @ExcelColumn(name="韬唤璇�",index= 3)
+    @TableField(exist = false)
+    private String memberidCard;
+
+    @ApiModelProperty(value = "鎵�灞炲叕鍙�")
+    @ExcelColumn(name="鎵�灞炲叕鍙�",index= 4)
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
+    @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
+    @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createDate;
+
+    @ApiModelProperty(value = "鎿嶄綔浜�")
+    @ExcelColumn(name="鎿嶄綔浜�",index= 7)
+    @TableField(exist = false)
+    private String createrName;
+
+    @ApiModelProperty(value = "涓嬪彂鐘舵�� 0寰呬笅鍙� 1宸蹭笅鍙� 2宸插彇娑�", example = "1")
+    @ExcelColumn(name="涓嬪彂鐘舵��",index= 8,valueMapping ="0=寰呬笅鍙�;1=宸蹭笅鍙�;2=宸插彇娑�" )
+    private Integer sendStatus;
+
+    @ApiModelProperty(value = "涓嬪彂绫诲瀷 0瀹炴椂 1瀹氭椂 ", example = "1")
+    @ExcelColumn(name="涓嬪彂绫诲瀷",index= 9,valueMapping ="0=瀹炴椂;1=瀹氭椂" )
+    private Integer sendType;
+
+
+
+    @ApiModelProperty(value = "涓嬪彂鏃堕棿")
+    @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date sendDate;
+
+    @ApiModelProperty(value = "涓嬪彂澶囨敞")
+    @ExcelColumn(name="涓嬪彂澶囨敞",index= 11)
+    private String sendInfo;
+
+    @ApiModelProperty(value = "涓嬪彂寮�濮嬫椂闂�")
+    @TableField(exist = false)
+    private String sendStartDate;
+    @ApiModelProperty(value = "涓嬪彂缁撴潫鏃堕棿")
+    @TableField(exist = false)
+    private String sendEndDate;
+
+    @ApiModelProperty(value = "鏃堕棿娈�0锛�7,30")
+    @TableField(exist = false)
+    private Integer timeDn;
+
 }

--
Gitblit v1.9.3