From 4e19be4587c4b3bfecea60e14782fcc011a6fb69 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 28 十二月 2024 08:37:59 +0800
Subject: [PATCH] 一般自动统计的类改成达意的名称
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java | 22 ++++++++++------------
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmountSv.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmount.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmount.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmount.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmountSv.java | 2 +-
7 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClient.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmount.java
similarity index 94%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClient.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmount.java
index 82aebe8..cf18f0b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClient.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmount.java
@@ -11,10 +11,10 @@
*/
@Slf4j
@Component
-public class StClient {
+public class StClientAmount {
@Autowired
- protected StClientSv sv ;
+ protected StClientAmountSv sv ;
private Integer statisticsYear;
private Integer statisticsMonth;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java
similarity index 98%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientSv.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java
index 2cf0dc1..3b793ba 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java
@@ -18,7 +18,7 @@
* @Description
*/
@Component
-public class StClientSv {
+public class StClientAmountSv {
@Autowired
protected RmClientAmountDayMapper rmClientAmountDayDao;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmount.java
similarity index 94%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmount.java
index ba6185c..b84940c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmount.java
@@ -11,10 +11,10 @@
*/
@Slf4j
@Component
-public class StIntake {
+public class StIntakeAmount {
@Autowired
- protected StIntakeSv sv ;
+ protected StIntakeAmountSv sv ;
private Integer statisticsYear;
private Integer statisticsMonth;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmountSv.java
similarity index 98%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeSv.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmountSv.java
index 3d6e9c7..7be2c7e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmountSv.java
@@ -18,7 +18,7 @@
* @Description
*/
@Component
-public class StIntakeSv {
+public class StIntakeAmountSv {
@Autowired
protected RmIntakeAmountDayMapper rmIntakeAmountDayDao;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLoss.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmount.java
similarity index 94%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLoss.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmount.java
index 0db2469..8b197fe 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLoss.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmount.java
@@ -11,10 +11,10 @@
*/
@Slf4j
@Component
-public class StLoss {
+public class StLossAmount {
@Autowired
- protected StLossSv sv ;
+ protected StLossAmountSv sv ;
private Integer statisticsYear;
private Integer statisticsMonth;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmountSv.java
similarity index 98%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmountSv.java
index a63881b..5e83be1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmountSv.java
@@ -18,7 +18,7 @@
* @Description
*/
@Component
-public class StLossSv {
+public class StLossAmountSv {
@Autowired
protected RmLossDayMapper rmLossDayDao;
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 37fe0d4..8c39927 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
@@ -6,7 +6,6 @@
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.common.util.DateTime;
import com.dy.common.util.IDLongGenerator;
-import com.dy.pipIrrGlobal.util.Org;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.quartz.JobDataMap;
@@ -14,7 +13,6 @@
import org.quartz.JobExecutionException;
import java.util.Date;
-import java.util.List;
/**
* @Author: liurunyu
@@ -27,9 +25,9 @@
private String orgTag ;
- private StLoss stLoss ;
- private StIntake stIntake ;
- private StClient stClient ;
+ private StLossAmount stLossAmount;
+ private StIntakeAmount stIntakeAmount;
+ private StClientAmount stClientAmount;
private StChargeByIc stChargeByIc ;
private StChargeByClient stChargeByClient ;
private StConsumeByIc stConsumeByIc ;
@@ -58,14 +56,14 @@
return ;
}
DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
- stLoss = SpringContextUtil.getBean(StLoss.class);
- stIntake = SpringContextUtil.getBean(StIntake.class);
- stClient = SpringContextUtil.getBean(StClient.class);
+ stLossAmount = SpringContextUtil.getBean(StLossAmount.class);
+ stIntakeAmount = SpringContextUtil.getBean(StIntakeAmount.class);
+ stClientAmount = SpringContextUtil.getBean(StClientAmount.class);
stChargeByIc = SpringContextUtil.getBean(StChargeByIc.class);
stChargeByClient = SpringContextUtil.getBean(StChargeByClient.class);
stConsumeByIc = SpringContextUtil.getBean(StConsumeByIc.class);
stConsumeByClient = SpringContextUtil.getBean(StConsumeByClient.class);
- if(stLoss != null && stIntake != null && stClient != null
+ if(stLossAmount != null && stIntakeAmount != null && stClientAmount != null
&& stChargeByIc != null && stChargeByClient != null
&& stConsumeByIc != null && stConsumeByClient != null){
String yesterday = DateTime.lastXDay_yyyy_MM_dd(1) ;//寰楀埌鏄ㄥぉ锛岄浂鏅ㄦ椂鍒荤粺璁★紝缁熻鏄ㄥぉ鐨勬暟
@@ -118,9 +116,9 @@
* 缁熻
*/
private void doStatisticsMonthAndYear(){
- stLoss.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
- stIntake.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
- stClient.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
+ stLossAmount.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
+ stIntakeAmount.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
+ stClientAmount.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
stChargeByIc.statistics4MonthAndYear(statisticsYear, statisticsMonth);
stChargeByClient.statistics4MonthAndYear(statisticsYear, statisticsMonth);
--
Gitblit v1.8.0