From 0be32a3805e1430b82b5bded8bd23946e274fa84 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 06 十一月 2024 14:27:35 +0800
Subject: [PATCH] 优化虚拟卡占用逻辑，占用时写入取水口编号，解除占用时清空虚拟卡编号；工单使用的4个表
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
index 3f7c6ef..7d46257 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
@@ -9,6 +9,7 @@
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo;
import com.dy.common.po.BaseEntity;
import com.dy.common.util.DateTime;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -61,56 +62,67 @@
/**
* 鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date dt;
/**
* 鎺у埗鍣ㄦ椂閽�
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date rtuDt;
/**
* 鏁版嵁鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd")
public Date dataDt;
/**
* 鏈勾绱娴侀噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterTotalAmountYear;
/**
* 姘磋〃绱娴侀噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterTotalAmountMeter;
/**
* 鏈勾绱鐢甸噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double eleTotalAmountYear;
/**
* 鐢佃〃绱鐢甸噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double eleTotalAmountMeter;
/**
* 褰撴棩姘磋〃鍑�娴侀噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterTotalAmountDay;
/**
* 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterUserTotalAmountDay;
/**
* 婕忔崯姘撮噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double lossTotalAmountDay;
/**
* 鍚庡鐢垫睜鐢靛帇
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double batteryVolt;
public void valueFrom(DataV202404 dataV202404, DataCd83Vo cdData) throws Exception{
--
Gitblit v1.8.0