From 30a14783481d100a6503a56c902b47182e542c93 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 08 十二月 2023 15:42:09 +0800
Subject: [PATCH] #组织树 和企业下的人员信息 人员卡信息

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 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 552070d..e498b41 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,11 +10,12 @@
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 璁垮鐢宠淇℃伅琛�
  * @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
  */
 @Data
 @ApiModel("璁垮鐢宠淇℃伅琛�")
@@ -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 = "鏉ヨ浜嬬敱")
@@ -130,8 +130,8 @@
     @ExcelColumn(name="鎺ュ緟浜哄憳")
     private Integer receptMemberId;
 
-    @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃牳閫氳繃 2瀹℃牳涓嶉�氳繃", example = "1")
-    @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃牳閫氳繃 2瀹℃牳涓嶉�氳繃")
+    @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒  2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触", example = "1")
+    @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒  2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触")
     private Integer status;
 
     @ApiModelProperty(value = "鍒濆浜虹紪鐮�", example = "1")
@@ -159,11 +159,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;
@@ -176,9 +180,12 @@
     @ExcelColumn(name="绛旈璁板綍缂栫爜锛堝叧鑱攗ser_answer)")
     private Integer userAnswerId;
 
-    @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+    @ApiModelProperty(value = "娴峰悍鏍囪瘑")
     @ExcelColumn(name="娴峰悍鏍囪瘑")
-    private Integer hkId;
+    private String hkId;
+    @ApiModelProperty(value = "openid")
+    @ExcelColumn(name="openid")
+    private String openid;
 
     @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
     @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -189,4 +196,14 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date hkDate;
 
+    @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