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/voSt/VoCumulativeFlow.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCumulativeFlow.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCumulativeFlow.java new file mode 100644 index 0000000..66728dc --- /dev/null +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCumulativeFlow.java @@ -0,0 +1,34 @@ +package com.dy.pipIrrGlobal.voSt; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * @author ZhuBaoMin + * @date 2024-08-01 16:12 + * @LastEditTime 2024-08-01 16:12 + * @Description 绱娴侀噺瑙嗗浘 + */ + +@Data +@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat" + ,"cumulativeFlow" , "getDate" +}) +@EqualsAndHashCode(callSuper=false) +public class VoCumulativeFlow extends VoIntake { + + /** + * 绱娴侀噺 + */ + public Double cumulativeFlow; + + /** + * 鏁版嵁鑾峰彇鏃ユ湡 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + public Date getDate; +} -- Gitblit v1.8.0