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/VoActiveCard.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java
index 17f3535..677dc81 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java
@@ -1,5 +1,7 @@
package com.dy.pipIrrGlobal.voSe;
+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 io.swagger.v3.oas.annotations.media.Schema;
@@ -21,6 +23,7 @@
private static final long serialVersionUID = 1L;
@Schema(title = "ID")
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long id;
@Schema(title = "鍐滄埛濮撳悕")
@@ -42,10 +45,16 @@
private Integer cardCost;
@Schema(title = "琛ュ崱閲戦")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double reissueAmount;
- @Schema(title = "鏀粯鏂瑰紡")
- private Integer paymentId;
+ //@Schema(title = "鏀粯鏂瑰紡")
+ //@JSONField(serializeUsing= ObjectWriterImplToString.class)
+ //private Long paymentId;
+ /**
+ * 鏀粯鏂瑰紡鍚嶇О
+ */
+ private String paymentName;
@Schema(title = "鎿嶄綔浜�")
private String operator;
--
Gitblit v1.8.0