From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java | 134 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 134 insertions(+), 0 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
new file mode 100644
index 0000000..bcef3c3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
@@ -0,0 +1,134 @@
+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 com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2023/12/5 8:27
+ * @LastEditTime 2023/12/5 8:27
+ * @Description
+ */
+
+@Data
+@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 = 202409211025001L;
+
+ /**
+ * 鎿嶄綔ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long opeId;
+
+ /**
+ * 姘村崱ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cardId;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ private String clientName;
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ private String phone;
+
+ /**
+ * 韬唤璇佸彿
+ */
+ private String idCard;
+
+ /**
+ * 鍐滄埛缂栧彿
+ */
+ private String clientNum;
+
+ /**
+ * 鏉戝浼氬悕绉�
+ */
+ private String villageName;
+
+ /**
+ * 灞呬綇鍦板潃
+ */
+ private String address;
+
+ /**
+ * 姘村崱鏈�缁堜綑棰�
+ */
+ private Float money;
+
+ /**
+ * 姘村崱缂栧彿
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cardNum;
+
+ /**
+ * 璐崱璐圭敤
+ */
+ private Integer cardCost;
+
+ /**
+ * 鏈鍏呭�奸噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float amount;
+
+ /**
+ * 鏈璧犻�侀噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float gift;
+
+ /**
+ * 杩旇繕閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float refundAmount;
+
+ /**
+ * 鍏呭�煎悗閲戦锛屽厖鍊兼椂浣欓 + 鏈鍏呭�奸噾棰� + 鏈璧犻�侀噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float afterRecharge;
+
+ /**
+ * 鏀粯鏂瑰紡
+ */
+ private String paymentName;
+
+ /**
+ * 姘翠环
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float price;
+
+ /**
+ * 鎿嶄綔浜�
+ */
+ 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")
+ private Date operateDt;
+}
--
Gitblit v1.8.0