From 4513ef24bf9b188c2a77d6ce94f1a6b7e9ebf0e6 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期日, 27 四月 2025 20:40:19 +0800 Subject: [PATCH] fix(irrigatePlan): 修正灌溉计划开始时间逻辑 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeAccumulateAmount.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeAccumulateAmount.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeAccumulateAmount.java index cb89d48..229219a 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeAccumulateAmount.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeAccumulateAmount.java @@ -1,19 +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; /** * @author :WuZeYu * @Date :2024/8/5 10:45 * @LastEditTime :2024/8/5 10:45 - * @Description 鍙栨按鍙g疮绉祦閲� 澶т簬 鎸囧畾鍊� + * @Description 鍙栨按鍙� 绱Н娴侀噺 澶т簬 鎸囧畾鍊� 瑙嗗浘 + * 鐢ㄦ按閲� 澶т簬 鎸囧畾鍊� + * 娑堣垂閲戦 澶т簬 鎸囧畾鍊� */ @Data +@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat" + ,"value", "valueInt" +}) +@EqualsAndHashCode(callSuper=false) public class VoIntakeAccumulateAmount extends VoIntake{ private static final long serialVersionUID = 202408051046001L; /** * 鎸囧畾鍊� */ + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) private Double value; + + /** + * 鎸囧畾鍊� + */ + private Integer valueInt; } -- Gitblit v1.8.0