From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug(新生成了记录,应该是更新老记录),修改之 ; 2、CommonV1_0_0中获取开关阀类型名称时,对于null返回空字符串。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java
index e216f9d..f7c4f9f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java
@@ -39,40 +39,48 @@
     /**
      * 鏈勾绱娴侀噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterTotalAmountYear;
 
     /**
      * 姘磋〃绱娴侀噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterTotalAmountMeter;
 
     /**
      * 鏈勾绱鐢甸噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double eleTotalAmountYear;
 
     /**
      * 鐢佃〃绱鐢甸噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double eleTotalAmountMeter;
 
     /**
      * 褰撴棩姘磋〃鍑�娴侀噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterTotalAmountDay;
 
     /**
      * 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterUserTotalAmountDay;
 
     /**
      * 婕忔崯姘撮噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double lossTotalAmountDay;
 
     /**
      * 鍚庡鐢垫睜鐢靛帇
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double batteryVolt;
 }

--
Gitblit v1.8.0