From 2d34613f07deabbbe7e5065c13eec61cfe2a4dcf Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 22 四月 2024 11:32:11 +0800
Subject: [PATCH] 最新版本
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 124 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 114 insertions(+), 10 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index ae625de..9068475 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.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;
@@ -8,7 +9,10 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.util.Date;
+import java.util.List;
/**
* 璁垮鐢宠淇℃伅琛�
@@ -31,7 +35,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -103,16 +107,31 @@
@ApiModelProperty(value = "闅忕▼浜哄憳鏁�", example = "1")
@ExcelColumn(name="闅忕▼浜哄憳鏁�")
private Integer memberNum;
-
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date starttime;
-
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熸埅姝�")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熸埅姝�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endtime;
+ @ApiModelProperty(value = "杩涘巶鏃堕棿")
+ @ExcelColumn(name="杩涘巶鏃堕棿")
+ private Date inDate;
+ @ApiModelProperty(value = "绂诲満鏃堕棿")
+ @ExcelColumn(name="绂诲満鏃堕棿")
+ private Date outDate;
+ @ApiModelProperty(value = "绂诲満鏂瑰紡 0姝ｅ父绛剧 1绠＄悊鍛樻墜鍔ㄧ绂�")
+ @ExcelColumn(name="绂诲満鏂瑰紡 0姝ｅ父绛剧 1绠＄悊鍛樻墜鍔ㄧ绂�")
+ private Integer outType;
+ @ApiModelProperty(value = "寮哄埗绛剧绠＄悊鍛樼紪鐮�")
+ @ExcelColumn(name="寮哄埗绛剧绠＄悊鍛樼紪鐮�")
+ private Integer outUserId;
+ @ApiModelProperty(value = "绛剧澶囨敞")
+ @ExcelColumn(name="绛剧澶囨敞")
+ private String outInfo;
@ApiModelProperty(value = "鏉ヨ浜嬬敱")
@ExcelColumn(name="鏉ヨ浜嬬敱")
@@ -130,8 +149,8 @@
@ExcelColumn(name="鎺ュ緟浜哄憳")
private Integer receptMemberId;
- @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷", example = "1")
- @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷")
+ @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�", example = "1")
+ @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�")
private Integer status;
@ApiModelProperty(value = "鍒濆浜虹紪鐮�", example = "1")
@@ -159,11 +178,15 @@
@ApiModelProperty(value = "缁堝澶囨敞")
@ExcelColumn(name="缁堝澶囨敞")
private String endCheckInfo;
-
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
+ private String idcardDecode;
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
@ExcelColumn(name="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収")
private Integer idcardType;
-
+ @ApiModelProperty(value = "鎬у埆 1鐢� 2濂� ", example = "1")
+ @ExcelColumn(name="鎬у埆 1鐢� 2濂�")
+ private Integer sex;
@ApiModelProperty(value = "杞︾墝鍙凤紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@ExcelColumn(name="杞︾墝鍙凤紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
private String carNos;
@@ -179,8 +202,19 @@
@ApiModelProperty(value = "娴峰悍鏍囪瘑")
@ExcelColumn(name="娴峰悍鏍囪瘑")
private String hkId;
+ @ApiModelProperty(value = "openid")
+ @ExcelColumn(name="openid")
+ private String openid;
+ @ApiModelProperty(value = "璁垮浜岀淮鐮�")
+ @ExcelColumn(name="璁垮浜岀淮鐮�")
+ private String qrcode;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+
+ @ApiModelProperty(value = "璁垮棰勭害鏂瑰紡锛�0鐧昏棰勭害 1鍏嶇櫥璁伴绾�", example = "1")
+ @ExcelColumn(name="璁垮棰勭害鏂瑰紡锛�0鐧昏棰勭害 1鍏嶇櫥璁伴绾�")
+ private Integer visitType;
+
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� ", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer hkStatus;
@@ -193,4 +227,74 @@
@ExcelColumn(name="ERP鐢宠璁板綍缂栫爜")
private String erpId;
+
+ @ApiModelProperty(value = "缁熻鏁伴噺 ")
+ @TableField(exist = false)
+ private int num ;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮侊紙鍏宠仈member琛�)", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮侊紙鍏宠仈member琛�)")
+ private Integer createMemberId;
+
+ @ApiModelProperty(value = "鏉ユ簮绫诲瀷锛�0=鏈郴缁燂紱1=ERP", example = "1")
+ private Integer sourceType;
+
+ @ApiModelProperty(value = "鏅�氳瀹㈢敵璇烽殢璁夸汉鍛�")
+ @TableField(exist = false)
+ private List<Visits> withUserList;
+// @ApiModelProperty(value = "鐝")
+// private String memberClasses;
+
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
+ @TableField(exist = false)
+ private Integer memberType;
+ @ApiModelProperty(value = "鍔冲姟璁垮鐢宠闅忚浜哄憳")
+ @TableField(exist = false)
+ private List<Integer> lwWithUserList;
+
+
+
+ @ApiModelProperty(value = "鍥剧墖鍓嶇紑")
+ @TableField(exist = false)
+ private String prefixUrl;
+
+ @ApiModelProperty(value = "琚浜哄憳濮撳悕", example = "1")
+ @ExcelColumn(name="琚浜哄憳濮撳悕")
+ @TableField(exist = false)
+ private String receptMemberName;
+ @ApiModelProperty(value = "琚浜哄憳娴峰悍缂栫爜", example = "1")
+ @ExcelColumn(name="琚浜哄憳濮撳悕")
+ @TableField(exist = false)
+ private String receptMemberHkId;
+
+ @ApiModelProperty(value = "琚浜哄憳閮ㄩ棬", example = "1")
+ @ExcelColumn(name="琚浜哄憳閮ㄩ棬")
+ @TableField(exist = false)
+ private String receptMemberDepartment;
+
+ @ApiModelProperty(value = "闂ㄧ缁勯泦鍚�", example = "1")
+ @ExcelColumn(name="闂ㄧ缁勯泦鍚�")
+ @TableField(exist = false)
+ private List<DeviceRole> deviceRoleList;
+
+ @ApiModelProperty(value = "闅忚浜哄憳鍒楄〃", example = "1")
+ @ExcelColumn(name="闅忚浜哄憳鍒楄〃")
+ @TableField(exist = false)
+ private List<Visits> visitsList;
+
+ @ApiModelProperty(value = "瓒呮椂鏃堕暱", example = "1")
+ @TableField(exist = false)
+ private Integer timeOut;
+
+ @ApiModelProperty(value = "闅忚杞﹁締鏁伴噺", example = "1")
+ @TableField(exist = false)
+ private Integer carNum;
+
+ @ApiModelProperty(value = "瓒呮椂鐘舵��0鏈秴鏃讹紝1宸茶秴鏃讹紝2鍗冲皢瓒呮椂", example = "1")
+ @TableField(exist = false)
+ private Integer outStatus;
+
+ @ApiModelProperty(value = "绂诲満鐘舵�侊紱0=鏈鍦�", example = "1",hidden = true)
+ @TableField(exist = false)
+ private Integer levelStatus;
}
--
Gitblit v1.9.3