From 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 16:33:36 +0800
Subject: [PATCH] 导出字段对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 91 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 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 552070d..fd67fb3 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,13 +108,27 @@
@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 = "杩涘巶鏃堕棿")
+ @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 +146,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 +175,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,11 +196,14 @@
@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")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� ", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer hkStatus;
@@ -189,4 +212,52 @@
@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 = "鐝")
+// 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 = "琚浜哄憳濮撳悕", 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<Device> deviceList;
+
+ @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 = "瓒呮椂鐘舵��0鏈秴鏃讹紝1宸茶秴鏃讹紝2鍗冲皢瓒呮椂", example = "1")
+ @TableField(exist = false)
+ private Integer outStatus;
+
}
--
Gitblit v1.9.3