From 6c40e04eb7c2060feb2533735cd3089d438965e5 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 19 三月 2024 17:19:36 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 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 1aa61b3..232b0ea 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
@@ -28,13 +28,10 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
private String creator;
-
-
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
private String edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -51,10 +48,9 @@
@ApiModelProperty(value = "浜哄憳缂栫爜", example = "1")
private Integer memberId;
+
@ApiModelProperty(value = "璁惧缂栫爜", example = "1")
private Integer deviceId;
-
-
@ApiModelProperty(value = "瀵煎叆鐘舵��", example = "1")
private Integer importStatus;
@@ -63,81 +59,81 @@
private String importInfo;
-
-
-
@ApiModelProperty(value = "涓嬪彂浜哄憳", example = "1")
private Integer sendUserId;
+ @ApiModelProperty(value = "涓嬪彂娆℃暟", example = "1")
+ private Integer tryNum;
@ApiModelProperty(value = "鍙栨秷浜哄憳", example = "1")
private Integer cancelUserId;
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelDate;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
- 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)
+ @ExcelColumn(name="濮撳悕",index = 1,width = 6)
@TableField(exist = false)
private String memberName;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�" ,index = 2)
+ @ExcelColumn(name="鎵嬫満鍙�" ,index = 2,width = 10)
@TableField(exist = false)
private String memberPhone;
@ApiModelProperty(value = "韬唤璇�")
- @ExcelColumn(name="韬唤璇�",index= 3)
+ @ExcelColumn(name="韬唤璇�",index= 3,width = 12)
@TableField(exist = false)
private String memberidCard;
@ApiModelProperty(value = "鎵�灞炲叕鍙�")
- @ExcelColumn(name="鎵�灞炲叕鍙�",index= 4)
+ @ExcelColumn(name="鎵�灞炲叕鍙�",index= 4,width = 12)
@TableField(exist = false)
private String companyName;
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
- @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd")
+ @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")
+ @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd",width = 10)
private Date endTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
private Date createDate;
@ApiModelProperty(value = "鎿嶄綔浜�")
- @ExcelColumn(name="鎿嶄綔浜�",index= 7)
@TableField(exist = false)
private String createrName;
+ @ApiModelProperty(value = "鍗＄墖闆嗗悎锛堣嫳鏂囬�楀彿闅斿紑锛�")
+ private String cardNos;
- @ApiModelProperty(value = "涓嬪彂鐘舵�� 0寰呬笅鍙� 1宸蹭笅鍙� 2宸插彇娑�", example = "1")
- @ExcelColumn(name="涓嬪彂鐘舵��",index= 8,valueMapping ="0=寰呬笅鍙�;1=宸蹭笅鍙�;2=宸插彇娑�" )
+ @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=瀹氭椂" )
+ @ExcelColumn(name="涓嬪彂绫诲瀷",index= 9,valueMapping ="0=瀹炴椂;1=瀹氭椂",width = 6 )
private Integer sendType;
-
-
@ApiModelProperty(value = "涓嬪彂鏃堕棿")
- @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @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)
+ @ExcelColumn(name="涓嬪彂澶囨敞",index= 11,width = 16)
private String sendInfo;
@ApiModelProperty(value = "涓嬪彂寮�濮嬫椂闂�")
@@ -150,5 +146,17 @@
@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 String memberHkId;
}
--
Gitblit v1.9.3