From bac51596a78abb6d9411b9ad2b7f49d6849af710 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 16:10:20 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
index 7f81a42..0de96ff 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
@@ -58,11 +58,11 @@
* @param dataCdC0Vo 寮�闃�涓婃姤鏁版嵁瀵硅薄
*/
private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
- Date findDt = controller.getFindDt() ;//鍙戠幇姝ゆ帶鍒跺櫒鐨勬棩鏈熶笌鏃堕棿
- if(findDt != null){
- String findDtStr = DateTime.yyyy_MM_dd(findDt) ;
- if(findDtStr.equals(DateTime.yyyy_MM_dd())){
- //褰撳ぉ鍙戠幇鎺у埗鍣紝鎺у埗鍣ㄨ绠楃殑婕忔崯閲忎竴瀹氫笉姝ｇ‘锛屽己鍒惰缃垚0
+ Date operateDt = controller.getOperateDt() ;//鍙栨按涓笂缁戝畾姝ゆ帶鍒跺櫒鐨勬棩鏈熶笌鏃堕棿
+ if(operateDt != null){
+ String operateDtStr = DateTime.yyyy_MM_dd(operateDt) ;
+ if(operateDtStr.equals(DateTime.yyyy_MM_dd())){
+ //褰撳ぉ鍙戠幇锛堝苟缁戝畾锛夋帶鍒跺櫒锛屾帶鍒跺櫒璁＄畻鐨勬紡鎹熼噺涓�瀹氫笉姝ｇ‘锛屽己鍒惰缃垚0
dataCdC0Vo.lossAmount = 0.0 ;
}
}
@@ -98,7 +98,10 @@
sv.updateRmLossHistory(poHistory);
}else if(DateTime.dateFrom_yyyy_MM_dd1(dV1_0_1.dt).after(poLast.dt)){
//鏂扮殑鏃ユ湡
- poLast = this.newRmLossLast(controller, rtuAddr, dV1_0_1, dataCdC0Vo);
+ poLast.lossAmount = dataCdC0Vo.lossAmount ;
+ poLast.dt = DateTime.dateFrom_yyyy_MM_dd1(dataCdC0Vo.rtuDt);
+ poLast.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
+ poLast.dtRtu = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt) ;
this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCdC0Vo, poLast);
sv.updateRmLossLast(poLast);
}else{
--
Gitblit v1.8.0