From 51a208c7715ecfea9faeccd5ee56ed2d0a697c95 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期六, 20 四月 2024 15:24:28 +0800
Subject: [PATCH] 工作调度

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java |  159 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 111 insertions(+), 48 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 c2e2136..17d3289 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;
@@ -13,7 +14,7 @@
 /**
  * 浜哄憳鎺堟潈瀵煎叆璁板綍
  * @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
  */
 @Data
 @ApiModel("浜哄憳鎺堟潈瀵煎叆璁板綍")
@@ -22,95 +23,157 @@
 
     @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 hkId;
+    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 String startTime;
-
-    @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
-    @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�")
-    private Integer endTime;
+    @ApiModelProperty(value = "璁惧缂栫爜", example = "1")
+    private Integer deviceId;
 
     @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")
+    private Integer tryNum;
+    @ApiModelProperty(value = "澶辫触閲嶈瘯 0闇�瑕� 1涓嶉渶瑕�", example = "1")
+    private Integer failFlag;
 
     @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;
+    private String cancelInfo;
+
+    @ApiModelProperty(value = "璁惧鍚嶇О")
+    @TableField(exist = false)
+    private String deviceName;
+
+    @ApiModelProperty(value = "鎵�灞炲叕鍙哥紪鐮�")
+    @TableField(exist = false)
+    private String companyId;
+
+    @ApiModelProperty(value = "濮撳悕")
+    @ExcelColumn(name="濮撳悕",index = 1,width = 6)
+    @TableField(exist = false)
+    private String memberName;
+
+    @ApiModelProperty(value = "鎵嬫満鍙�")
+    @ExcelColumn(name="鎵嬫満鍙�" ,index = 2,width = 10)
+    @TableField(exist = false)
+    private String memberPhone;
+
+    @ApiModelProperty(value = "韬唤璇�")
+    @ExcelColumn(name="韬唤璇�",index= 3,width = 12)
+    @TableField(exist = false)
+    private String memberidCard;
+
+    @ApiModelProperty(value = "鎵�灞炲叕鍙�")
+    @ExcelColumn(name="鎵�灞炲叕鍙�",index= 4,width = 12)
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
+    @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd",width = 10)
+    private Date startTime;
+
+    @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
+    @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd",width = 10)
+    private Date endTime;
+
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
+    private Date createDate;
+
+    @ApiModelProperty(value = "鎿嶄綔浜�")
+    @TableField(exist = false)
+    private String createrName;
+    @ApiModelProperty(value = "鍗$墖闆嗗悎锛堣嫳鏂囬�楀彿闅斿紑锛�")
+    private String cardNos;
+
+    @ApiModelProperty(value = "涓�鍗¢�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1浠诲姟鎵ц 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉� 6涓嶇鍚堜笅鍙戞潯浠� ", example = "1")
+    @ExcelColumn(name="涓嬪彂鐘舵��",index= 8,valueMapping ="0=寰呬笅鍙�;1=宸蹭笅鍙�;2=涓嬪彂鎴愬姛;3=宸插彇娑�;4=涓嬪彂澶辫触;5=浠诲姟涓嬭浇宸茬粨鏉�;6==涓嶇鍚堜笅鍙戞潯浠�",width = 10 )
+    private Integer sendStatus;
+
+    @ApiModelProperty(value = "涓嬪彂绫诲瀷 0瀹炴椂 1瀹氭椂 ", example = "1")
+    @ExcelColumn(name="涓嬪彂绫诲瀷",index= 9,valueMapping ="0=瀹炴椂;1=瀹氭椂",width = 6 )
+    private Integer sendType;
+
+    @ApiModelProperty(value = "涓嬪彂鏃堕棿")
+    @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sendDate;
+
+    @ApiModelProperty(value = "涓嬪彂澶囨敞")
+    @ExcelColumn(name="涓嬪彂澶囨敞",index= 11,width = 16)
+    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;
+    @ApiModelProperty(value = "鏃堕棿娈�0锛�7,30")
+    @TableField(exist = false)
+    private String deviceChannelNo;
+    @ApiModelProperty(value = "娴峰悍璁惧绫诲瀷code")
+    @TableField(exist = false)
+    private String deviceType;
+    @ApiModelProperty(value = "娴峰悍璁惧ode")
+    @TableField(exist = false)
+    private String deviceIndexCode;
+    @ApiModelProperty(value = "娴峰悍璁惧鍦ㄧ嚎鐘舵��")
+    @TableField(exist = false)
+    private Integer deviceOnline;
+    @ApiModelProperty(value = "浜哄憳娴峰悍缂栫爜")
+    @TableField(exist = false)
+    private String memberHkId;
+    @ApiModelProperty(value = "浜哄憳娴峰悍浜鸿劯鐘舵�� 0鏈悓姝� 1鍚屾鎴愬姛 2鍚屾澶辫触 3璁惧寤烘ā澶辫触")
+    @TableField(exist = false)
+    private Integer memberFaceStatus;
+    @ApiModelProperty(value = "浜哄憳娴峰悍鍚屾鐘舵�� ")
+    @TableField(exist = false)
+    private Integer memberHkStatus;
+    @ApiModelProperty(value = "浜哄憳鏄惁鍒犻櫎 0鍚� 1鏄�")
+    @TableField(exist = false)
+    private Integer memberDeleted;
+    @ApiModelProperty(value = "涓存椂瀛楁")
+    @TableField(exist = false)
+    private Integer tempCouunt;
 
 }

--
Gitblit v1.9.3