From c30cfcc106111b8087691557ee8143f6be9c4e5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 07 十二月 2023 15:21:35 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..e38623c 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;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 璁垮鐢宠淇℃伅琛�
@@ -106,12 +108,10 @@
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date starttime;
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熸埅姝�")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熸埅姝�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endtime;
@ApiModelProperty(value = "鏉ヨ浜嬬敱")
@@ -159,7 +159,9 @@
@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;
@@ -192,5 +194,11 @@
@ApiModelProperty(value = "ERP鐢宠璁板綍缂栫爜")
@ExcelColumn(name="ERP鐢宠璁板綍缂栫爜")
private String erpId;
+ @ApiModelProperty(value = "鏅�氳瀹㈢敵璇烽殢璁夸汉鍛�")
+ @TableField(exist = false)
+ private List<Visits> withUserList;
+ @ApiModelProperty(value = "鍔冲姟璁垮鐢宠闅忚浜哄憳")
+ @TableField(exist = false)
+ private List<Integer> lwWithUserList;
}
--
Gitblit v1.9.3