From 24c4b9dc96bcfd6a4096004d91816ac2e16a85a3 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 27 八月 2024 09:41:47 +0800
Subject: [PATCH] 2024-08-27 朱宝民 总账记录及明细账记录导出功能

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
index 49ef7bb..264803d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
@@ -1,5 +1,10 @@
 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.alibaba.fastjson2.annotation.JSONField;
 import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.dy.common.po.BaseEntity;
@@ -16,40 +21,50 @@
 
 @Data
 @JsonPropertyOrder({ "generalId", "cashierId", "cashierName", "tradeAmount", "gift", "refundAmount", "totalAmount", "operateDate", "auditStatus"})
-@Schema(title = "璐㈠姟瀵硅处涔嬫�昏处瑙嗗浘瀵硅薄")
+@HeadRowHeight(30)
+@ContentRowHeight(20)
 public class VoGeneral implements BaseEntity {
     private static final long serialVersionUID = 202401241706001L;
 
     @Schema(title = "鎬昏处ID")
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @ExcelIgnore
     private Long generalId;
 
     @Schema(title = "鏀堕摱鍛業D")
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @ExcelIgnore
     private Long cashierId;
 
-    @Schema(title = "鏀堕摱鍛樺鍚�")
+    @ExcelProperty(value = {"${title}", "鏀堕摱鍛樺鍚�"})
+    @ColumnWidth(18)
     private String cashierName;
 
-    @Schema(title = "瀹炴敹閲戦")
+    @ExcelProperty(value = {"${title}", "瀹炴敹閲戦"})
+    @ColumnWidth(15)
     private Float tradeAmount;
 
-    @Schema(title = "璧犻�侀噾棰�")
+    @ExcelProperty(value = {"${title}", "璧犻�侀噾棰�"})
+    @ColumnWidth(15)
     private Float gift;
 
-    @Schema(title = "杩旇繕閲戦")
+    @ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
+    @ColumnWidth(15)
     private Float refundAmount;
 
     /**
-     * 鎬婚 = 瀹炴敹閲戦 + 璧犻�侀噾棰� + 杩旇繕閲戦
+     * 鎬婚 = 瀹炴敹閲戦 + 璧犻�侀噾棰� - 杩旇繕閲戦
      */
-    @Schema(title = "鎬婚")
+    @ExcelProperty(value = {"${title}", "鎬婚"})
+    @ColumnWidth(10)
     private Float totalAmount;
 
-    @Schema(title = "浜ゆ槗鏃ユ湡")
+    @ExcelProperty(value = {"${title}", "浜ゆ槗鏃ユ湡"})
+    @ColumnWidth(15)
     private String operateDate;
 
-    @Schema(title = "瀹℃牳鐘舵��")
+    @ExcelProperty(value = {"${title}", "瀹℃牳鐘舵��"})
+    @ColumnWidth(15)
     private String auditStatus;
 
 }

--
Gitblit v1.8.0