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-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java
index 543e308..bafa458 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java
@@ -20,17 +20,20 @@
@Schema(name = "IC鍗″厖鍊艰褰曟煡璇㈡潯浠�")
public class QoRecharge extends QueryConditionVo {
- @Schema(description = "鍐滄埛濮撳悕")
- public String clientName;
+ private String clientName;
- @Schema(description = "鍐滄埛缂栧彿")
- private Long clientId;
+ private String clientNum;
- @Schema(description = "IC鍗″彿")
- public String cardAddr;
+ private Long cardNum;
- @Schema(description = "浠樻鏂瑰紡")
- public Integer paymentId;
+ //@Schema(description = "鍐滄埛缂栧彿")
+ //private Long clientId;
+
+ //@Schema(description = "IC鍗″彿")
+ //public String cardAddr;
+
+ //@Schema(description = "浠樻鏂瑰紡")
+ //public Integer paymentId;
//@Schema(description = "鍏呭�兼椂闂確寮�濮�")
//public LocalDateTime rechargeTimeStart;
@@ -38,9 +41,7 @@
//@Schema(description = "鍏呭�兼椂闂確缁撴潫")
//public LocalDateTime rechargeTimeStop;
- @Schema(description = "鍏呭�兼椂闂確寮�濮�")
- public String rechargeTimeStart;
+ //public String rechargeTimeStart;
- @Schema(description = "鍏呭�兼椂闂確缁撴潫")
- public String rechargeTimeStop;
+ //public String rechargeTimeStop;
}
--
Gitblit v1.8.0