From 24f91c6e8b6a5e5be813e0b740dec3d381abe254 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 06 一月 2025 10:56:50 +0800
Subject: [PATCH] 农户用水月统计、年统计查询实现
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoDayIntakeAmount.java | 83 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoDayIntakeAmount.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoDayIntakeAmount.java
index 88fef3c..197f8c2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoDayIntakeAmount.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoDayIntakeAmount.java
@@ -14,81 +14,94 @@
*/
@Data
-@JsonPropertyOrder({ "intakeId", "intakeNum", "amount1" , "amount2" , "amount3" , "amount4" , "amount5" , "amount6" , "amount7" , "amount8" , "amount9" , "amount10" , "amount11" , "amount12" , "amount13" , "amount14" , "amount15" , "amount16" , "amount17" , "amount18" , "amount19" , "amount20" , "amount21" , "amount22" , "amount23" , "amount24" , "amount25" , "amount26" , "amount27" , "amount28" , "amount29" , "amount30" , "amount31" })
+@JsonPropertyOrder(value = { "intakeId", "intakeNum", "intakeLng", "intakeLat",
+ "amount1" , "amount2" , "amount3" , "amount4" , "amount5" , "amount6" , "amount7" , "amount8" , "amount9" ,
+ "amount10" , "amount11" , "amount12" , "amount13" , "amount14" , "amount15" , "amount16" , "amount17" , "amount18" , "amount19" ,
+ "amount20" , "amount21" , "amount22" , "amount23" , "amount24" , "amount25" , "amount26" , "amount27" , "amount28" , "amount29" ,
+ "amount30" , "amount31" }, alphabetic = false)
public class VoDayIntakeAmount {
- private static final long serialVersionUID = 202408080933001L;
+ public static final long serialVersionUID = 202408080933001L;
/**
* 鍙栨按鍙D
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- private Long intakeId;
+ public Long intakeId;
/**
* 鍙栨按鍙ｇ紪鍙�
*/
- private String intakeNum;
+ public String intakeNum;
+
+ /**
+ * 缁忓害
+ */
+ public Double intakeLng;
+ /**
+ * 绾害
+ */
+ public Double intakeLat;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount1;
+ public Double amount1;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount2;
+ public Double amount2;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount3;
+ public Double amount3;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount4;
+ public Double amount4;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount5;
+ public Double amount5;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount6;
+ public Double amount6;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount7;
+ public Double amount7;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount8;
+ public Double amount8;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount9;
+ public Double amount9;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount10;
+ public Double amount10;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount11;
+ public Double amount11;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount12;
+ public Double amount12;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount13;
+ public Double amount13;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount14;
+ public Double amount14;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount15;
+ public Double amount15;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount16;
+ public Double amount16;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount17;
+ public Double amount17;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount18;
+ public Double amount18;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount19;
+ public Double amount19;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount20;
+ public Double amount20;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount21;
+ public Double amount21;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount22;
+ public Double amount22;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount23;
+ public Double amount23;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount24;
+ public Double amount24;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount25;
+ public Double amount25;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount26;
+ public Double amount26;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount27;
+ public Double amount27;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount28;
+ public Double amount28;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount29;
+ public Double amount29;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount30;
+ public Double amount30;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- private Double amount31;
+ public Double amount31;
}
--
Gitblit v1.8.0