From 39739e34af928aae204c55db7974213c9b938c5a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 二月 2024 18:33:14 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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..5105d1c 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")
@@ -106,10 +108,15 @@
@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;
@@ -215,6 +222,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 +241,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 +262,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="闅忚浜哄憳鍒楄〃")
--
Gitblit v1.9.3