From b81e59b6ef96ac100109f7662365ff3bec805a2d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 十二月 2024 17:01:43 +0800
Subject: [PATCH] pipIrr-web-temp增加删除日统计水量（漏损、取水口、农户）
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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 b9fd28b..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,6 +1,15 @@
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;
@@ -8,36 +17,58 @@
* @author ZhuBaoMin
* @date 2024-01-24 17:00
* @LastEditTime 2024-01-24 17:00
- * @Description
+ * @Description 2024-08-22 鏈卞疂姘戝鍔犳�婚瀛楁
*/
@Data
-@Schema(title = "璐㈠姟瀵硅处涔嬫�昏处瑙嗗浘瀵硅薄")
+@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")
- private String generalId;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @ExcelIgnore
+ private Long generalId;
@Schema(title = "鏀堕摱鍛業D")
- private String cashierId;
+ @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;
+
+ /**
+ * 鎬婚 = 瀹炴敹閲戦 + 璧犻�侀噾棰� - 杩旇繕閲戦
+ */
+ @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