From 1e69d160cb1e04b1438db0ca950dd5c15088619d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 15:26:52 +0800
Subject: [PATCH] 灌溉计划终止时不区分终止方式

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java |   74 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 0 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
new file mode 100644
index 0000000..8df7453
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
@@ -0,0 +1,74 @@
+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;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-01-24 17:00
+ * @LastEditTime 2024-01-24 17:00
+ * @Description 2024-08-22 鏈卞疂姘戝鍔犳�婚瀛楁
+ */
+
+@Data
+@JsonPropertyOrder({ "generalId", "cashierId", "cashierName", "tradeAmount", "gift", "refundAmount", "totalAmount", "operateDate", "auditStatus"})
+@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;
+
+    @ExcelProperty(value = {"${title}", "鏀堕摱鍛樺鍚�"})
+    @ColumnWidth(18)
+    private String cashierName;
+
+    @ExcelProperty(value = {"${title}", "瀹炴敹閲戦"})
+    @ColumnWidth(15)
+    private Float tradeAmount;
+
+    @ExcelProperty(value = {"${title}", "璧犻�侀噾棰�"})
+    @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    private Float gift;
+
+    @ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
+    @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    private Float refundAmount;
+
+    /**
+     * 鎬婚 = 瀹炴敹閲戦 + 璧犻�侀噾棰� - 杩旇繕閲戦
+     */
+    @ExcelProperty(value = {"${title}", "鎬婚"})
+    @ColumnWidth(10)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    private Float totalAmount;
+
+    @ExcelProperty(value = {"${title}", "浜ゆ槗鏃ユ湡"})
+    @ColumnWidth(15)
+    private String operateDate;
+
+    @ExcelProperty(value = {"${title}", "瀹℃牳鐘舵��"})
+    @ColumnWidth(15)
+    private String auditStatus;
+
+}

--
Gitblit v1.8.0