From 8d2b573ced32e6ca6fab7c1dc45e1fa108030ba1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 28 八月 2024 17:21:23 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 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 3caef8d..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,51 +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 = "鏀堕摱鍛業D")
+ @ExcelIgnore
private String cashierId;
- @Schema(title = "鍖哄垝鍚嶇О涓�")
- private String districtTitle;
-
@Schema(title = "鏉戝簞ID")
+ @ExcelIgnore
private String villageId;
- @Schema(title = "鍐滄埛濮撳悕")
- private String clientName;
-
- @Schema(title = "鑱旂郴鐢佃瘽")
- private String phone;
-
@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;
- @Schema(title = "璐崱閲戦")
+ @ExcelProperty(value = {"${title}", "璐崱閲戦"})
+ @ColumnWidth(15)
private Double cardCost;
- @Schema(title = "璧犻�侀噾棰�")
+ @ExcelProperty(value = {"${title}", "璧犻�侀噾棰�"})
+ @ColumnWidth(15)
private Double gift;
- @Schema(title = "杩斿洖閲戦")
+ @ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
+ @ColumnWidth(15)
private Double refundAmount;
- @Schema(title = "浠樻鏂瑰紡")
+ @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 = "浜ゆ槗鏃堕棿")
+ @ExcelProperty(value = {"${title}", "浜ゆ槗鏃堕棿"})
+ @ColumnWidth(20)
private Date tradeTime;
+
}
--
Gitblit v1.8.0