From 37d2aec0dbe914c8924d6514da7eca053eee4cf3 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 26 三月 2025 17:26:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIcSv.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIcSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIcSv.java
index 3669d4f..28ad3f3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIcSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIcSv.java
@@ -44,7 +44,12 @@
List<VoIcRechargeStatistics> list = seRechargeHistoryMapper.statisticsByIc(statisticsStartId, statisticsEndId) ;
if(list != null && list.size() > 0){
for(VoIcRechargeStatistics vo : list){
- StRechargeIcDay po = this.stRechargeIcDayMapper.selectByClientAndCardAndYearAndMonth(vo.clientId, vo.cardId, statisticsYear, statisticsMonth) ;
+ List<StRechargeIcDay> listOfDay = this.stRechargeIcDayMapper.selectByClientAndCardAndYearAndMonth(vo.clientId, vo.cardId, statisticsYear, statisticsMonth) ;
+ StRechargeIcDay po = null ;
+ if(listOfDay != null && listOfDay.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfDay.get(0) ;
+ }
if(po == null){
po = new StRechargeIcDay() ;
po.clientId = vo.clientId ;
@@ -71,7 +76,12 @@
List<VoIcRechargeStatistics> list = stRechargeIcDayMapper.statisticsByIc(statisticsYear, statisticsMonth) ;
if(list != null && list.size() > 0){
for(VoIcRechargeStatistics vo : list){
- StRechargeIcMonth po = this.stRechargeIcMonthMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
+ List<StRechargeIcMonth> listOfMonth = this.stRechargeIcMonthMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
+ StRechargeIcMonth po = null ;
+ if(listOfMonth != null && listOfMonth.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfMonth.get(0) ;
+ }
if(po == null){
po = new StRechargeIcMonth() ;
po.clientId = vo.clientId ;
@@ -97,7 +107,12 @@
List<VoIcRechargeStatistics> list = stRechargeIcMonthMapper.statisticsByIc(statisticsYear) ;
if(list != null && list.size() > 0){
for(VoIcRechargeStatistics vo : list){
- StRechargeIcYear po = this.stRechargeIcYearMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
+ List<StRechargeIcYear> listOfYear = this.stRechargeIcYearMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
+ StRechargeIcYear po = null ;
+ if(listOfYear != null && listOfYear.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfYear.get(0) ;
+ }
if(po == null){
po = new StRechargeIcYear() ;
po.clientId = vo.clientId ;
--
Gitblit v1.8.0