From 43a19a4424f67c379934ed0d70e0d1b3512cd769 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 27 三月 2025 09:31:44 +0800 Subject: [PATCH] 灌溉计划表中增加项目ID字段,计划列表返回值中增加项目名称,项目状态改为整数表示 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeAccumulateAmount.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 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 adb437e..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,7 +1,9 @@ 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 @@ -12,6 +14,10 @@ * 娑堣垂閲戦 澶т簬 鎸囧畾鍊� */ @Data +@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat" + ,"value", "valueInt" +}) +@EqualsAndHashCode(callSuper=false) public class VoIntakeAccumulateAmount extends VoIntake{ private static final long serialVersionUID = 202408051046001L; @@ -20,4 +26,9 @@ */ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) private Double value; + + /** + * 鎸囧畾鍊� + */ + private Integer valueInt; } -- Gitblit v1.8.0