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/ParkBook.java |   70 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
index 11dbc56..08f2fb6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.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("杞﹁締棰勭害璁板綍淇℃伅琛�")
@@ -53,7 +54,7 @@
 
     @ApiModelProperty(value = "棰勭害鏍囪瘑", example = "1")
     @ExcelColumn(name="棰勭害鏍囪瘑")
-    private Integer hkId;
+    private String hkId;
 
     @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
     @ExcelColumn(name="鎺掑簭鐮�")
@@ -71,4 +72,69 @@
     @ExcelColumn(name="杞﹀簱缂栫爜锛堝叧鑱攑arks)")
     private Integer parkId;
 
+    @ApiModelProperty(value = "绫诲瀷 0鍐呴儴浜哄憳鍥哄畾杞﹁締 1鍔冲姟璁垮鐢宠闅忕▼杞﹁締 2璁垮鐢宠闅忕▼杞﹁締", example = "1")
+    @ExcelColumn(name="绫诲瀷 0鍐呴儴浜哄憳鍥哄畾杞﹁締 1鍔冲姟璁垮鐢宠闅忕▼杞﹁締 2璁垮鐢宠闅忕▼杞﹁締")
+    private Integer origin;
+
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    @ExcelColumn(name="寮�濮嬫椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    @ExcelColumn(name="缁撴潫鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    @ApiModelProperty(value = "浜哄憳缂栫爜", example = "1")
+    @ExcelColumn(name="浜哄憳缂栫爜")
+    private Integer memberId;
+
+    @ApiModelProperty(value = "鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鏃堕棿娈�", example = "1")
+    @ExcelColumn(name="鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鏃堕棿娈�")
+    private Integer timeType;
+
+    @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+    @ExcelColumn(name="娴峰悍鏍囪瘑")
+    private String hkId2;
+
+    @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0寰呬笅鍙� 1涓嬪彂鎴愬姛 2涓嬪彂澶辫触 3鍙栨秷涓嬪彂", example = "1")
+    @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0寰呬笅鍙� 1涓嬪彂鎴愬姛 2涓嬪彂澶辫触 3鍙栨秷涓嬪彂")
+    private Integer hkStatus;
+
+    @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
+    @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date hkDate;
+
+
+    @ApiModelProperty(value = "鍋滆溅鍦哄悕绉�", example = "1")
+    @ExcelColumn(name="鍋滆溅鍦哄悕绉�")
+    @TableField(exist = false)
+    private String parksName;
+
+    @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹�  2鍐呴儴浜哄憳", example = "1")
+    @ExcelColumn(name="鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹�  2鍐呴儴浜哄憳")
+    @TableField(exist = false)
+    private Integer memberType;
+
+    @ApiModelProperty(value = "濮撳悕", example = "1")
+    @ExcelColumn(name="濮撳悕")
+    @TableField(exist = false)
+    private String memberName;
+
+    @ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
+    @ExcelColumn(name="鎵嬫満鍙�")
+    @TableField(exist = false)
+    private String memberPhone;
+
+    @ApiModelProperty(value = "閮ㄩ棬", example = "1")
+    @ExcelColumn(name="閮ㄩ棬")
+    @TableField(exist = false)
+    private String companyName;
+    @ApiModelProperty(value = "鍋滆溅搴撴捣搴风紪鐮�", example = "1")
+    @ExcelColumn(name="鍋滆溅搴撴捣搴风紪鐮�")
+    @TableField(exist = false)
+    private String parkHkId;
+
 }

--
Gitblit v1.9.3