From 75432e263f73a89baed5dc4c4cccbe2ca7d6d446 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 03 三月 2025 10:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index f68d81d..d47352a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -347,7 +347,7 @@
public void valueFrom84(DataV202404 dataV202404, DataCd84Vo cdData) throws Exception {
this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
- this.opType = null;
+ this.opType = cdData.opType;
this.opTotalAmount = cdData.waterTotalAmount;
this.opIcCardNo = cdData.icCardNo;
this.opIcCardAddr = cdData.icCardAddr;
@@ -378,7 +378,7 @@
public void valueFrom85(DataV202404 dataV202404, DataCd85Vo cdData) throws Exception {
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt);
- this.opType = cdData.clType;
+ this.clType = cdData.clType;
this.clIcCardAddr = cdData.icCardAddr;
this.clIcCardNo = cdData.icCardNo;
this.clTotalAmount = cdData.waterTotalAmount;
@@ -453,7 +453,7 @@
public void updateFrom(DataV202404 dataV202404, DataCd84Vo dataCd84Vo, Boolean clearCloseValve) throws Exception {
this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
- this.opType = null;
+ this.opType = dataCd84Vo.opType;
this.opTotalAmount = dataCd84Vo.waterTotalAmount;
this.opIcCardNo = dataCd84Vo.icCardNo;
this.opIcCardAddr = dataCd84Vo.icCardAddr;
@@ -548,10 +548,14 @@
this.clTotalAmount = cdData.waterTotalAmount;
this.clIcCardNo = cdData.icCardNo;
this.clIcCardAddr = cdData.icCardAddr;
+ this.clOrderNo = cdData.orderNo;
this.clRemainMoney = cdData.moneyRemain;
+ this.clEleTotalAmount = cdData.eleTotalAmount;
+ this.clWaterRemainUser = cdData.waterRemain;
this.clThisAmount = cdData.thisWater;
this.clThisMoney = cdData.thisMoney;
this.clThisTime = cdData.thisDuration;
+ this.clThisEle = cdData.thisEle;
this.clPrice = null;
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt) ;
--
Gitblit v1.8.0