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/pojoRm/RmIntakeAmountDay.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDay.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDay.java
index a09de53..357870a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDay.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDay.java
@@ -15,7 +15,7 @@
/**
* @Author: liurunyu
* @Date: 2024/7/8 18:53
- * @Description 鍙栨按鍙ｆ棩鍙栨按閲忔紡鎹熼噺
+ * @Description 鍙栨按鍙ｆ棩鍙栨按閲忔垨婕忔崯閲�
*/
@TableName(value="rm_intake_amount_day", autoResultMap = true)
@Data
@@ -23,7 +23,7 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "鍙栨按鍙ｆ棩鍙栨按閲忔紡鎹熼噺")
+@Schema(name = "鍙栨按鍙ｆ棩鍙栨按閲忔垨婕忔崯閲�")
public class RmIntakeAmountDay implements BaseEntity {
public static final long serialVersionUID = 2024007081854001L;
@@ -56,6 +56,17 @@
public Double amount;
/**
+ * 鏃ュ彇娑堣垂閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money;
+
+ /**
+ * 鏃ュ彇姘存鏁�
+ */
+ public Integer times;
+
+ /**
* 绱鏃ユ紡鎹熸按閲�
*/
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
--
Gitblit v1.8.0