From 0d1260a63328ee65bcb9bc6e8af2a0cdaf74cee2 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 30 八月 2024 11:22:45 +0800
Subject: [PATCH] 2024-08-30 朱宝民 优化获取水卡列表接口
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 7940161..559f77e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -1,7 +1,12 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.dy.common.po.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,30 +21,67 @@
*/
@Data
-@Schema(title = "璐㈠姟瀵硅处锛屼氦鏄撴槑缁嗚鍥惧璞�")
+@JsonPropertyOrder({ "cashierId", "villageId", "clientNum", "districtTitle", "clientName", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "paymentName", "tradeTime"})
+@HeadRowHeight(30)
+@ContentRowHeight(20)
public class VoTradeDetails implements BaseEntity {
private static final long serialVersionUID = 202402012040001L;
- @Schema(title = "鍐滄埛濮撳悕")
- private String clientName;
+ @Schema(title = "鏀堕摱鍛業D")
+ @ExcelIgnore
+ private String cashierId;
- @Schema(title = "鑱旂郴鐢佃瘽")
- private String phone;
+ @Schema(title = "鏉戝簞ID")
+ @ExcelIgnore
+ private String villageId;
@Schema(title = "鍐滄埛缂栧彿")
+ @ExcelIgnore
private String clientNum;
- @Schema(title = "涓氬姟绫诲瀷")
+ @ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
+ @ColumnWidth(20)
+ private String districtTitle;
+
+ @ExcelProperty(value = {"${title}", "鍐滄埛濮撳悕"})
+ @ColumnWidth(15)
+ private String clientName;
+
+ @ExcelProperty(value = {"${title}", "鑱旂郴鐢佃瘽"})
+ @ColumnWidth(15)
+ private String phone;
+
+ @ExcelProperty(value = {"${title}", "涓氬姟绫诲瀷"})
+ @ColumnWidth(15)
private String operateType;
- @Schema(title = "浜ゆ槗閲戦")
+ @ExcelProperty(value = {"${title}", "浜ゆ槗閲戦"})
+ @ColumnWidth(15)
private Double tradeAmount;
- @Schema(title = "浠樻鏂瑰紡")
+ @ExcelProperty(value = {"${title}", "璐按閲戦"})
+ @ColumnWidth(15)
+ private Double waterCost;
+
+ @ExcelProperty(value = {"${title}", "璐崱閲戦"})
+ @ColumnWidth(15)
+ private Double cardCost;
+
+ @ExcelProperty(value = {"${title}", "璧犻�侀噾棰�"})
+ @ColumnWidth(15)
+ private Double gift;
+
+ @ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
+ @ColumnWidth(15)
+ private Double refundAmount;
+
+ @ExcelProperty(value = {"${title}", "浠樻鏂瑰紡"})
+ @ColumnWidth(15)
private String paymentName;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Schema(title = "浜ゆ槗鏃堕棿")
- private Date tradeDate;
+ @ExcelProperty(value = {"${title}", "浜ゆ槗鏃堕棿"})
+ @ColumnWidth(20)
+ private Date tradeTime;
+
}
--
Gitblit v1.8.0