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/VisitEvent.java | 71 +++++++++++++++--------------------
1 files changed, 31 insertions(+), 40 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
index c5112c6..cae7ab9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.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;
@@ -22,152 +23,142 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
- @ExcelColumn(name="浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
private String eventId;
@ApiModelProperty(value = "浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
- @ExcelColumn(name="浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
private String srcIndex;
@ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
- @ExcelColumn(name="浜嬩欢婧愮被鍨�")
private String srcType;
@ApiModelProperty(value = "浜嬩欢婧愬悕绉�")
- @ExcelColumn(name="浜嬩欢婧愬悕绉�")
private String srcName;
@ApiModelProperty(value = "浜嬩欢绫诲瀷锛堢櫥璁� 绛剧锛�")
- @ExcelColumn(name="浜嬩欢绫诲瀷")
private Integer eventType;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
- @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
- @ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿")
private Integer timeout;
@ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
- @ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ @ExcelColumn(name="浜嬩欢鏃堕棿",index = 9,width = 16)
private String happenTime;
@ApiModelProperty(value = "浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
- @ExcelColumn(name="浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
private String srcParentIndex;
@ApiModelProperty(value = "璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁")
- @ExcelColumn(name="璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁")
private String visitorId;
@ApiModelProperty(value = "濮撳悕")
- @ExcelColumn(name="濮撳悕")
+ @ExcelColumn(name="濮撳悕" ,index = 1,width = 10)
private String personName;
@ApiModelProperty(value = "鎬у埆 1-鐢�2-濂�", example = "1")
- @ExcelColumn(name="鎬у埆 1-鐢�2-濂�")
private Integer sex;
@ApiModelProperty(value = "璇佷欢绫诲瀷 111韬唤璇�")
- @ExcelColumn(name="璇佷欢绫诲瀷 111韬唤璇�")
private Integer idType;
@ApiModelProperty(value = "璇佷欢鍙� ")
- @ExcelColumn(name="璇佷欢鍙� ")
private String idNo;
@ApiModelProperty(value = "琚闂汉濮撳悕")
- @ExcelColumn(name="琚闂汉濮撳悕")
+ @ExcelColumn(name="琚闂汉濮撳悕",index = 6,width = 16)
private String beVisitedPersonName;
@ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁�")
- @ExcelColumn(name="琚闂汉鎵�灞炵粍缁�")
+ @ExcelColumn(name="琚闂汉缁勭粐",index = 7,width = 30)
private String beVisitedPersonOrg;
@ApiModelProperty(value = "鏉ヨ鍗曚綅")
- @ExcelColumn(name="鏉ヨ鍗曚綅")
+ @ExcelColumn(name="鍏徃",index = 4,width = 20)
private String visitorWorkUint;
@ApiModelProperty(value = "璁垮楠岃瘉鐮�")
- @ExcelColumn(name="璁垮楠岃瘉鐮�")
private String visitorCode;
@ApiModelProperty(value = "鏉ヨ浜嬬敱")
- @ExcelColumn(name="鏉ヨ浜嬬敱")
private String purpose;
@ApiModelProperty(value = "璇佷欢绛惧彂鏈哄叧")
- @ExcelColumn(name="璇佷欢绛惧彂鏈哄叧")
private String signOrg;
@ApiModelProperty(value = "鏉ヨ鏃堕棿")
- @ExcelColumn(name="鏉ヨ鏃堕棿")
private String startTime;
@ApiModelProperty(value = "绂诲紑鏃堕棿")
- @ExcelColumn(name="绂诲紑鏃堕棿")
private String endTime;
@ApiModelProperty(value = "鎵嬫満鍙风爜")
- @ExcelColumn(name="鎵嬫満鍙风爜")
+ @ExcelColumn(name="鎵嬫満鍙风爜",index = 2,width = 10)
private String phone;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�",index = 5,width = 16)
private String carNo;
@ApiModelProperty(value = "鐓х墖uri")
- @ExcelColumn(name="鐓х墖uri")
private String photoUrl;
@ApiModelProperty(value = "鎶撴媿鍥緐ri")
- @ExcelColumn(name="鎶撴媿鍥緐ri")
private String captureUrl;
@ApiModelProperty(value = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
- @ExcelColumn(name="鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
private String svrIndexCode;
@ApiModelProperty(value = "琚闂汉id")
- @ExcelColumn(name="琚闂汉id")
private String beVisitedPersonId;
@ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁噄d")
- @ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
private String beVisitedPersonOrgId;
- @ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁噄d")
- @ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
+ @ApiModelProperty(value = "璇佷欢鍙�")
+ @ExcelColumn(name="璇佷欢鍙�" ,index = 3,width = 16)
private String idcardDecode;
+ // 鏉′欢鏌ヨ鍙傛暟
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String keyWords;
+
+ @ApiModelProperty(value = "鍏徃/閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+
+ @ApiModelProperty(value = "缁熻鏁伴噺 ")
+ @TableField(exist = false)
+ private int num ;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+ @TableField(exist = false)
+ @ExcelColumn(name="浜嬩欢绫诲瀷",index = 8,width = 16)
+ private String eventTypeName;
+
+ @ApiModelProperty(value = "鎶撴媿鍥緐ri瀹屾暣")
+ @TableField(exist = false)
+ private String captureUrlFull;
}
--
Gitblit v1.9.3