From f77e9a7cfbe775523551df5faab3c70a5a9c190c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 03 三月 2025 14:22:35 +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/VoGeneral.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 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..8df7453 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,8 +1,14 @@
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;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -16,40 +22,53 @@
@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)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float gift;
- @Schema(title = "杩旇繕閲戦")
+ @ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
+ @ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float refundAmount;
/**
- * 鎬婚 = 瀹炴敹閲戦 + 璧犻�侀噾棰� + 杩旇繕閲戦
+ * 鎬婚 = 瀹炴敹閲戦 + 璧犻�侀噾棰� - 杩旇繕閲戦
*/
- @Schema(title = "鎬婚")
+ @ExcelProperty(value = {"${title}", "鎬婚"})
+ @ColumnWidth(10)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
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