From e4aa9db5e3c91c969adf2361f8069b8c54244e1a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 15 四月 2025 12:02:39 +0800
Subject: [PATCH] 获取轮灌组详情接口，对轮灌组增加终止状态判断
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
index be0ee93..190160a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
@@ -315,7 +315,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;
@@ -347,7 +347,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.opType;
+ this.clType = cdData.clType;
this.clIcCardAddr = cdData.icCardAddr;
this.clIcCardNo = cdData.icCardNo;
this.clTotalAmount = cdData.waterTotalAmount;
@@ -430,6 +430,48 @@
}
}
+
+ public void updateFrom(DataV202404 dataV202404, DataCd84Vo cdData, Boolean clearLastCloseValve) throws Exception {
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
+ this.opType = cdData.opType;
+ this.opTotalAmount = cdData.waterTotalAmount;
+ this.opIcCardNo = cdData.icCardNo;
+ this.opIcCardAddr = cdData.icCardAddr;
+ this.opRemainMoney = cdData.moneyRemainUser;
+ this.opOrderNo = cdData.orderNo; //姹熸捣鍗忚鐗规湁
+ this.opEleTotalAmount = cdData.eleTotalAmount; //姹熸捣鍗忚鐗规湁
+ this.opWaterRemainUser = cdData.waterRemainUser; //姹熸捣鍗忚鐗规湁
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt);
+
+ if (clearLastCloseValve != null && clearLastCloseValve.booleanValue()) {
+ this.clearCloseValue();
+ }
+ }
+
+
+ public void updateFrom(DataV202404 dataV202404, DataCd85Vo cdData, Boolean clearLastOpenValve) throws Exception {
+ this.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
+ this.clType = cdData.clType;
+ 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) ;
+
+ if(clearLastOpenValve != null && clearLastOpenValve.booleanValue()){
+ this.clearOpenValue();
+ }
+ }
+
public void clearCloseValue(){
this.clDt = null;
this.clType = null;
--
Gitblit v1.8.0