From ad6dfb8323ab40ca8fe4fed94722c755d89c3203 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 28 二月 2024 15:14:47 +0800 Subject: [PATCH] 整理 --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java | 74 ++++++++++++++++++++++++++++++++++-- 1 files changed, 69 insertions(+), 5 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..7e319a5 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("杞﹁締棰勭害璁板綍淇℃伅琛�") @@ -31,16 +32,14 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�") @ExcelColumn(name="鏇存柊浜虹紪鐮�") - private String edirot; + private Integer editor; @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -53,7 +52,7 @@ @ApiModelProperty(value = "棰勭害鏍囪瘑", example = "1") @ExcelColumn(name="棰勭害鏍囪瘑") - private Integer hkId; + private String hkId; @ApiModelProperty(value = "鎺掑簭鐮�", example = "1") @ExcelColumn(name="鎺掑簭鐮�") @@ -71,4 +70,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