From de000e39e5acf882a1e3ea78f078373d6605bb36 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 二月 2024 10:11:23 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 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..d135487 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;
@@ -70,23 +71,19 @@
@ApiModelProperty(value = "浜嬩欢绫诲瀷")
@ExcelColumn(name="浜嬩欢绫诲瀷")
- private String eventType;
+ private Integer 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 = "鑴夊啿瓒呮椂鏃堕棿")
@ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿")
- private String timeout;
+ private Integer timeout;
@ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
@ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
@@ -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 = "浜嬩欢缂栧彿")
@@ -176,7 +163,7 @@
@ApiModelProperty(value = "杞︾墝棰滆壊")
@ExcelColumn(name="杞︾墝棰滆壊")
- private String plateColor;
+ private Integer plateColor;
@ApiModelProperty(value = "杞︾墝缃俊搴�", example = "1")
@ExcelColumn(name="杞︾墝缃俊搴�")
@@ -234,4 +221,41 @@
@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 Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endTime;
+ @ApiModelProperty(value = "浜哄憳鍚嶇О ")
+ @TableField(exist = false)
+ private String memberName ;
+ @ApiModelProperty(value = "缁熻鏁伴噺 ")
+ @TableField(exist = false)
+ private int num ;
+ @ApiModelProperty(value = "灏忔椂 ")
+ @TableField(exist = false)
+ private Integer hour ;
+ @ApiModelProperty(value = "浜哄憳缂栫爜 ")
+ private Integer memberId ;
+ @ApiModelProperty(value = "浜哄憳绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍛樺伐")
+ @TableField(exist = false)
+ private Integer memberType ;
+
+
+ @ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
+ @TableField(exist = false)
+ private String visitCompanyName;
}
--
Gitblit v1.9.3