From ad6dfb8323ab40ca8fe4fed94722c755d89c3203 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 15:14:47 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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 fd67fb3..38bacc3 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
@@ -9,6 +9,8 @@
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;
@@ -33,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")
@@ -105,18 +107,19 @@
@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="闂ㄧ鏈夋晥鏈熷紑濮�")
private Date starttime;
-
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熸埅姝�")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熸埅姝�")
private Date endtime;
@ApiModelProperty(value = "杩涘巶鏃堕棿")
@ExcelColumn(name="杩涘巶鏃堕棿")
private Date inDate;
-
@ApiModelProperty(value = "绂诲満鏃堕棿")
@ExcelColumn(name="绂诲満鏃堕棿")
private Date outDate;
@@ -146,8 +149,8 @@
@ExcelColumn(name="鎺ュ緟浜哄憳")
private Integer receptMemberId;
- @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触", example = "1")
- @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触")
+ @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")
@@ -202,6 +205,14 @@
@ApiModelProperty(value = "openid")
@ExcelColumn(name="openid")
private String openid;
+ @ApiModelProperty(value = "璁垮浜岀淮鐮�")
+ @ExcelColumn(name="璁垮浜岀淮鐮�")
+ private String qrcode;
+
+
+ @ApiModelProperty(value = "璁垮棰勭害鏂瑰紡锛�0鐧昏棰勭害 1鍏嶇櫥璁伴绾�", example = "1")
+ @ExcelColumn(name="璁垮棰勭害鏂瑰紡锛�0鐧昏棰勭害 1鍏嶇櫥璁伴绾�")
+ private Integer visitType;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� ", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -215,6 +226,13 @@
@ApiModelProperty(value = "ERP鐢宠璁板綍缂栫爜")
@ExcelColumn(name="ERP鐢宠璁板綍缂栫爜")
private String erpId;
+
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮侊紙鍏宠仈member琛�)", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮侊紙鍏宠仈member琛�)")
+ private Integer createMemberId;
+
+
@ApiModelProperty(value = "鏅�氳瀹㈢敵璇烽殢璁夸汉鍛�")
@TableField(exist = false)
private List<Visits> withUserList;
@@ -227,6 +245,12 @@
@ApiModelProperty(value = "鍔冲姟璁垮鐢宠闅忚浜哄憳")
@TableField(exist = false)
private List<Integer> lwWithUserList;
+
+
+
+ @ApiModelProperty(value = "鍥剧墖鍓嶇紑")
+ @TableField(exist = false)
+ private String prefixUrl;
@ApiModelProperty(value = "琚浜哄憳濮撳悕", example = "1")
@ExcelColumn(name="琚浜哄憳濮撳悕")
@@ -242,10 +266,10 @@
@TableField(exist = false)
private String receptMemberDepartment;
- @ApiModelProperty(value = "闂ㄧ闆嗗悎", example = "1")
- @ExcelColumn(name="闂ㄧ闆嗗悎")
+ @ApiModelProperty(value = "闂ㄧ缁勯泦鍚�", example = "1")
+ @ExcelColumn(name="闂ㄧ缁勯泦鍚�")
@TableField(exist = false)
- private List<Device> deviceList;
+ private List<DeviceRole> deviceRoleList;
@ApiModelProperty(value = "闅忚浜哄憳鍒楄〃", example = "1")
@ExcelColumn(name="闅忚浜哄憳鍒楄〃")
@@ -256,8 +280,15 @@
@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