From f998c05b75de537e95e927e955abac646d343c57 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 14 十二月 2023 14:39:35 +0800
Subject: [PATCH] 车辆出入事件信息

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
index d6aedd1..f229bba 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.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;
@@ -72,16 +73,12 @@
     @ExcelColumn(name="浜嬩欢绫诲瀷")
     private String eventType;
 
-    @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂
-            1-寮�濮�
-            2-鍋滄
-            4-浜嬩欢鑱斿姩缁撴灉鏇存柊
-            5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
-    @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂
-            1-寮�濮�
-            2-鍋滄
-            4-浜嬩欢鑱斿姩缁撴灉鏇存柊
-            5-浜嬩欢鍥剧墖寮傛涓婁紶")
+    @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+    @TableField(exist = false)
+    private String eventTypeName;
+
+    @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂 1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+    @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂 1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
     private Integer status;
 
     @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
@@ -108,18 +105,8 @@
     @ExcelColumn(name="鍗″彿")
     private String cardNo;
 
-    @ApiModelProperty(value = "浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢
-            2:涓婁紶鍥剧墖
-            3:鍏ュ満
-            4:鍑哄満
-            5:杞︾墝鐭
-            6:鍥剧墖閲嶄紶", example = "1")
-    @ExcelColumn(name="浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢
-            2:涓婁紶鍥剧墖
-            3:鍏ュ満
-            4:鍑哄満
-            5:杞︾墝鐭
-            6:鍥剧墖閲嶄紶")
+    @ApiModelProperty(value = "浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢2:涓婁紶鍥剧墖3:鍏ュ満4:鍑哄満5:杞︾墝鐭6:鍥剧墖閲嶄紶", example = "1")
+    @ExcelColumn(name="浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢2:涓婁紶鍥剧墖3:鍏ュ満4:鍑哄満5:杞︾墝鐭6:鍥剧墖閲嶄紶")
     private Integer eventCmd;
 
     @ApiModelProperty(value = "浜嬩欢缂栧彿")
@@ -234,4 +221,26 @@
     @ExcelColumn(name="鍥剧墖鏈嶅姟鍣ㄧ紪鍙�	")
     private String svrIndex;
 
+
+    // 鏉′欢鏌ヨ鍙傛暟
+    @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+    @TableField(exist = false)
+    private String keyWords;
+
+    @ApiModelProperty(value = "鍏徃/閮ㄩ棬鍚嶇О")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "浜哄憳绫诲瀷")
+    @TableField(exist = false)
+    private String memberType;
+
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    @TableField(exist = false)
+    private Date startTime;
+
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    @TableField(exist = false)
+    private Date endTime;
+
 }

--
Gitblit v1.9.3