From 2b6cd5a6e64e00b365707468d600085259d2f069 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 十二月 2024 16:13:29 +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/StatisticsJob.java | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java
index ce95708..37fe0d4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java
@@ -57,6 +57,7 @@
if(orgTag == null){
return ;
}
+ DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
stLoss = SpringContextUtil.getBean(StLoss.class);
stIntake = SpringContextUtil.getBean(StIntake.class);
stClient = SpringContextUtil.getBean(StClient.class);
@@ -108,18 +109,6 @@
* 缁熻
*/
private void doStatisticsDay(){
- /*
- List<Org.OrgVo> orgList = Org.OrgList ;
- if(orgList != null && orgList.size() >0){
- for(Org.OrgVo vo : orgList){
- DataSourceContext.set(vo.tag);//璁剧疆鏁版嵁婧�
- stChargeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
- stChargeByClient.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
- stConsumeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartDt, statistics4DayEndDt);
- stConsumeByClient.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartDt, statistics4DayEndDt);
- }
- } */
- DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
stChargeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
stChargeByClient.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
stConsumeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartDt, statistics4DayEndDt);
@@ -129,7 +118,6 @@
* 缁熻
*/
private void doStatisticsMonthAndYear(){
- DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
stLoss.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
stIntake.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
stClient.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
--
Gitblit v1.8.0