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/VoRecharge.java | 101 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 85 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
index fdd0c57..bcef3c3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
@@ -1,8 +1,10 @@
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;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,50 +18,117 @@
*/
@Data
-@Schema(title = "鍏呭�艰褰曡鍥惧璞�")
+@JsonPropertyOrder({ "opeId", "cardId", "clientName", "phone", "idCard", "clientNum", "villageName", "address", "money", "cardNum", "cardCost", "amount", "gift", "refundAmount", "afterRecharge", "paymentName", "price", "opr"})
public class VoRecharge implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202409211025001L;
- @Schema(title = "ID")
- private String id;
+ /**
+ * 鎿嶄綔ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long opeId;
- @Schema(title = "鍐滄埛濮撳悕")
+ /**
+ * 姘村崱ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cardId;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
private String clientName;
+ /**
+ * 鎵嬫満鍙�
+ */
private String phone;
+ /**
+ * 韬唤璇佸彿
+ */
private String idCard;
- @Schema(title = "鍐滄埛缂栧彿")
+ /**
+ * 鍐滄埛缂栧彿
+ */
private String clientNum;
+ /**
+ * 鏉戝浼氬悕绉�
+ */
+ private String villageName;
+
+ /**
+ * 灞呬綇鍦板潃
+ */
+ private String address;
+
+ /**
+ * 姘村崱鏈�缁堜綑棰�
+ */
private Float money;
- @Schema(title = "姘村崱缂栧彿")
- private String cardNum;
+ /**
+ * 姘村崱缂栧彿
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cardNum;
- @Schema(title = "鍏呭�奸噾棰�")
+ /**
+ * 璐崱璐圭敤
+ */
+ private Integer cardCost;
+
+ /**
+ * 鏈鍏呭�奸噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float amount;
- @Schema(title = "杩斿洖閲戦")
+ /**
+ * 鏈璧犻�侀噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float gift;
+
+ /**
+ * 杩旇繕閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float refundAmount;
- @Schema(title = "鍏呭�煎悗閲戦")
+ /**
+ * 鍏呭�煎悗閲戦锛屽厖鍊兼椂浣欓 + 鏈鍏呭�奸噾棰� + 鏈璧犻�侀噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float afterRecharge;
- @Schema(title = "鏀粯鏂瑰紡")
+ /**
+ * 鏀粯鏂瑰紡
+ */
private String paymentName;
- @Schema(title = "姘翠环")
+ /**
+ * 姘翠环
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float price;
- @Schema(title = "鎿嶄綔浜�")
+ /**
+ * 鎿嶄綔浜�
+ */
private String opr;
+ /**
+ * 鎿嶄綔绫诲瀷
+ */
private String operateType;
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Schema(title = "鎿嶄綔鏃堕棿")
private Date operateDt;
}
--
Gitblit v1.8.0