From 3f00a9c7853c2c3f53c69c3bb4b689b60184dfc4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 22:07:02 +0800
Subject: [PATCH] 1、VO、PO等值对象中凡时Double或Float类型的属性，都加上注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )； 2、工作报中数据查询SQL中增加clientAddr农户地址字段。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIcRemainMoney.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIcRemainMoney.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIcRemainMoney.java
index 554ead7..f15c4c8 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIcRemainMoney.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIcRemainMoney.java
@@ -69,9 +69,14 @@
if(vo != null && vo.id != null){
if(vo.money != null){
if(vo.money > dataVo.remainMoney){
+ //鏈湴鐨勫墿浣欓噾棰� 澶т簬 RTU涓婃姤鐨勫墿浣欓噾棰�
this.updateIcCardRemainMoney(sv, vo.id, dataVo.remainMoney);
+ }else{
+ //鏈湴鐨勫墿浣欓噾棰� 灏忎簬 RTU涓婃姤鐨勫墿浣欓噾棰濓紝璇存槑褰撳墠涓婃姤鍙兘鏄ˉ鎶ユ垨鍏朵粬鍘熷洜閫犳垚鐨勭幇璞�
+ //涓嶅仛澶勭悊
}
}else{
+ //杩欑鎯呭喌涓�鑸笉浼氬瓨鍦紝闄ら潪鏈変粈涔堣鎿嶄綔閫犳垚
this.updateIcCardRemainMoney(sv, vo.id, dataVo.remainMoney);
}
}
@@ -83,9 +88,14 @@
if(vo != null && vo.id != null){
if(vo.money != null){
if(vo.money > dataVo.remainMoney){
+ //鏈湴鐨勫墿浣欓噾棰� 澶т簬 RTU涓婃姤鐨勫墿浣欓噾棰�
this.updateVirIcCardRemainMoney(sv, vo.id, dataVo.remainMoney);
+ }else{
+ //鏈湴鐨勫墿浣欓噾棰� 灏忎簬 RTU涓婃姤鐨勫墿浣欓噾棰濓紝璇存槑褰撳墠涓婃姤鍙兘鏄ˉ鎶ユ垨鍏朵粬鍘熷洜閫犳垚鐨勭幇璞�
+ //涓嶅仛澶勭悊
}
}else{
+ //杩欑鎯呭喌涓�鑸笉浼氬瓨鍦紝闄ら潪鏈変粈涔堣鎿嶄綔閫犳垚
this.updateVirIcCardRemainMoney(sv, vo.id, dataVo.remainMoney);
}
}
--
Gitblit v1.8.0