From 6c40e04eb7c2060feb2533735cd3089d438965e5 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 19 三月 2024 17:19:36 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 88 ++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 3543fe6..8a10521 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.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;
@@ -13,7 +14,7 @@
/**
* 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�")
@@ -21,92 +22,115 @@
public class Retention {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
+ @ApiModelProperty(value = "涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
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鏄�")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)", example = "1")
- @ExcelColumn(name="鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
+ @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
private Integer companyId;
@ApiModelProperty(value = "浜鸿劯鐓х墖")
- @ExcelColumn(name="浜鸿劯鐓х墖")
private String faceImg;
@ApiModelProperty(value = "鍋ュ悍鐮�")
- @ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅")
+ @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 2, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;",width = 8)
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О")
- @ExcelColumn(name="璁垮鍚嶇О")
+ @ExcelColumn(name="濮撳悕" ,index = 3,width = 6)
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
- @ExcelColumn(name="璁垮骞撮緞")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�")
+ @ExcelColumn(name="鎵嬫満鍙�" ,index = 4,width = 12)
private String phone;
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
- @ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
@ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
- @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
+ @ExcelColumn(name="韬唤璇佸彿" ,index = 5,width = 12)
private String idcardDecode;
@ApiModelProperty(value = "宸ュ彿")
- @ExcelColumn(name="宸ュ彿")
private String code;
@ApiModelProperty(value = "鐝")
- @ExcelColumn(name="鐝")
- private String classes;
+ private Integer classes;
+
+ @ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
+ @ExcelColumn(name="杩涘巶闂ㄧ" ,index = 6,width = 12)
+ private String deviceName;
+
+ @ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
+ private String deviceIndex;
@ApiModelProperty(value = "鍏ュ巶鏃堕棿")
- @ExcelColumn(name="鍏ュ巶鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="杩涘満鏃堕棿" ,index = 7,width = 12,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date eventDate;
- @ApiModelProperty(value = "璁垮ID(鍏宠仈member)", example = "1")
- @ExcelColumn(name="璁垮ID(鍏宠仈member)")
+ @ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
private Integer memberId;
@ApiModelProperty(value = "浜嬩欢绫诲瀷鐮�")
- @ExcelColumn(name="浜嬩欢绫诲瀷鐮�")
private String eventCode;
+
+ @ApiModelProperty(value = "杞︾墝鍙凤紙type=3浣跨敤锛�")
+ private String carNo;
+
+ @ApiModelProperty(value = "鍏徃缁勭粐")
+ @TableField(exist = false)
+ public String companyName;
+
+ @ApiModelProperty(value = "璁垮缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ public String visitCompanyName;
+
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String keyWords;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endTime;
+
+ @ApiModelProperty(value = "浜鸿劯鐓х墖")
+ @TableField(exist = false)
+ private String faceImgFull;
+
+ @ApiModelProperty(value = "瀵煎嚭鍏徃鍚嶇О",hidden = true)
+ @ExcelColumn(name="鍏徃/缁勭粐" ,index = 1,width = 12)
+ @TableField(exist = false)
+ public String excelCompanyName;
+
}
--
Gitblit v1.9.3