From b8470f5e90d0aed22bf2c4bf9f5d2a13cd60b15f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 十二月 2024 14:03:41 +0800
Subject: [PATCH] 1、统计模块实现农户日用水量纵转横转存，月、年用水量统计； 2、临时模块农户日用水量纵转横转存，月、年用水量统计；
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java
index 0e9c043..cd7a838 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java
@@ -1,8 +1,12 @@
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 com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -13,39 +17,48 @@
* @Description
*/
@Data
+@JsonPropertyOrder({"vcId", "clientId", "rechargeTime", "rechargeAmount", "afterRecharge", "rechargeType"})
public class VoVcRecharge implements BaseEntity {
+ private static final long serialVersionUID = 202410211420001L;
- @Schema(title = "鍏呭�糏D")
- private Long id;
-
- @Schema(description = "铏氭嫙鍗D")
+ /**
+ * 铏氭嫙鍗D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long vcId;
- @Schema(description = "鍐滄埛ID")
+ /**
+ * 鍐滄埛ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long clientId;
-
- @Schema(description = "閽卞寘浣欓")
- private Double money;
-
- @Schema(description = "鍏呭�煎悗浣欓")
- private Double afterRecharge;
-
- @Schema(description = "璁㈠崟鍙�")
- private String orderNumber;
-
- @Schema(description = "鍏呭�奸噾棰�")
- private Integer rechargeAmount;
-
- @Schema(description = "涓嬪崟鏃堕棿")
- private Date orderTime;
-
- @Schema(description = "鍏呭�煎畬鎴愭椂闂�")
+ /**
+ * 鍏呭�煎畬鎴愭椂闂�
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date rechargeTime;
- @Schema(description = "璁㈠崟鐘舵��")
- private Byte orderState;
+ /**
+ * 鍏呭�奸噾棰�
+ */
+ private Double rechargeAmount;
- @Schema(description = "璁㈠崟鐘舵��")
- private String orderStateName;
+ /**
+ * 鍏呭�煎悗浣欓
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double afterRecharge;
+
+ /**
+ * 鍏呭�肩被鍨�
+ */
+ private String rechargeType;
+
+ /**
+ * 铏氭嫙鍗＄姸鎬侊紝鏆傛椂涓嶇敤锛岀洿鎺ヨ繃婊ゆ帀宸叉敞閿�铏氭嫙鍗�
+ */
+ //private String cardState;
+
}
--
Gitblit v1.8.0