From a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 一月 2025 16:40:32 +0800
Subject: [PATCH] 1、取水口用水日统计表中增加金额、次数字段； 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指定值的取水口”、“指定时间段内消费金额超过指定值的取水口”几个统计查询； 3、改“指定时间段内用水时长超过指定值的取水口”为“指定时间段内用水次数超过指定值的取水口”
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java
index 28dd560..cc4f0ac 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java
@@ -1,39 +1,58 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
/**
* @author ZhuBaoMin
* @date 2024-01-22 18:27
* @LastEditTime 2024-01-22 18:27
- * @Description
+ * @Description 浜ゆ槗璁板綍姹囨�昏鍥惧璞�
*/
@Data
-@Schema(title = "浜ゆ槗璁板綍姹囨�昏鍥惧璞�")
public class VoTransactionStatistics implements BaseEntity {
private static final long serialVersionUID = 202401241705001L;
- @Schema(title = "涓氬姟绫诲瀷")
+ /**
+ * 涓氬姟绫诲瀷
+ */
private String operateType;
- @Schema(title = "浜ゆ槗鏃ユ湡")
+ /**
+ * 浜ゆ槗鏃ユ湡
+ */
private String tradeDate;
- @Schema(title = "浜ゆ槗绗旀暟")
+ /**
+ * 浜ゆ槗绗旀暟
+ */
private Integer count;
- @Schema(title = "瀹炴敹閲戦")
+ /**
+ * 瀹炴敹閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float received;
- @Schema(title = "璧犻�侀噾棰�")
+ /**
+ * 璧犻�侀噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float gift;
- @Schema(title = "杩旇繕閲戦")
+ /**
+ * 杩旇繕閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float refundAmount;
- @Schema(title = "鏀堕摱鍛業D")
- private String cashierId;
+ /**
+ * 鏀堕摱鍛業D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cashierId;
}
--
Gitblit v1.8.0