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/Retention.java |   43 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 34 insertions(+), 9 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 8ec02d3..61c681a 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;
@@ -21,11 +22,11 @@
 public class Retention {
 
     @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "涓婚敭", example = "1")
+    @ApiModelProperty(value = "涓婚敭")
     @ExcelColumn(name="涓婚敭")
     private Integer id;
 
-    @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+    @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
     @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
     private Integer creator;
 
@@ -34,7 +35,7 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
-    @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+    @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
     @ExcelColumn(name="鏇存柊浜虹紪鐮�")
     private Integer editor;
 
@@ -43,7 +44,7 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
-    @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+    @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
     @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
     private Integer isdeleted;
 
@@ -51,7 +52,7 @@
     @ExcelColumn(name="澶囨敞")
     private String remark;
 
-    @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)", example = "1")
+    @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
     @ExcelColumn(name="鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
     private Integer companyId;
 
@@ -63,7 +64,7 @@
     @ExcelColumn(name="鍋ュ悍鐮�")
     private String imgurl;
 
-    @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐", example = "1")
+    @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
     @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
     private Integer type;
 
@@ -94,14 +95,19 @@
 
     @ApiModelProperty(value = "鐝")
     @ExcelColumn(name="鐝")
-    private String classes;
-
+    private Integer classes;
+    @ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
+    @ExcelColumn(name="娴峰悍闂ㄧ鍚嶇О")
+    private String deviceName;
+    @ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
+    @ExcelColumn(name="娴峰悍闂ㄧ缂栫爜")
+    private String deviceIndex;
     @ApiModelProperty(value = "鍏ュ巶鏃堕棿")
     @ExcelColumn(name="鍏ュ巶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date eventDate;
 
-    @ApiModelProperty(value = "璁垮ID(鍏宠仈member)", example = "1")
+    @ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
     @ExcelColumn(name="璁垮ID(鍏宠仈member)")
     private Integer memberId;
 
@@ -109,4 +115,23 @@
     @ExcelColumn(name="浜嬩欢绫诲瀷鐮�")
     private String eventCode;
 
+    @ApiModelProperty(value = "鍏徃缁勭粐")
+    @ExcelColumn(name="鍏徃缁勭粐")
+    @TableField(exist = false)
+    public String companyName;
+
+
+    // 鏉′欢鏌ヨ鍙傛暟
+    @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+    @TableField(exist = false)
+    private String keyWords;
+
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    @TableField(exist = false)
+    private Date startTime;
+
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    @TableField(exist = false)
+    private Date endTime;
+
 }

--
Gitblit v1.9.3