From ef7526aa13ad39ed177b4088066bd532b0a2ac07 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 26 十月 2023 11:25:50 +0800
Subject: [PATCH] # excel导出调整
---
server/services/src/main/java/com/doumee/dao/business/model/Locks.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java b/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
index d23b13d..bb86ca0 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Locks.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;
@@ -17,7 +18,7 @@
*/
@Data
@ApiModel("閿佸ご淇℃伅琛�")
-@TableName("`locks`")
+@TableName("\"locks\"")
public class Locks {
@ApiModelProperty(value = "缂栫爜")
@@ -26,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -58,16 +59,30 @@
@ExcelColumn(name="缂栧彿")
private String code;
- @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1寮傚父", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 1寮傚父")
+ @ApiModelProperty(value = "鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父", example = "1")
+ @ExcelColumn(name="鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父")
private Integer status;
@ApiModelProperty(value = "绔欑偣缂栫爜(鍏宠仈sites)")
@ExcelColumn(name="绔欑偣缂栫爜(鍏宠仈sites)")
private String siteId;
+ @ApiModelProperty(value = "绔欑偣缂栫爜(鍏宠仈sites)")
+ @ExcelColumn(name="绔欑偣缂栫爜(鍏宠仈sites)")
+ @TableField(select = false)
+ private String siteName;
+
@ApiModelProperty(value = "褰撳墠閿佸畾鑷杞︾紪鍙�")
@ExcelColumn(name="褰撳墠閿佸畾鑷杞︾紪鍙�")
private String bikeCode;
+ @ApiModelProperty(value = "褰撳墠閿佸畾鑷杞︾紪鍙�")
+ @ExcelColumn(name="褰撳墠閿佸畾鑷杞︾被鍨�")
+ @TableField(select = false)
+ private String bikeType;
+
+ @ApiModelProperty(value = "褰撳墠閿佸畾鑷杞︾紪鍙�")
+ @TableField(exist = false)
+ private Sites sites;
+
}
--
Gitblit v1.9.3