From 41b64c2ae2b2d9d7ff43d754b2f54d395bcb3eac Mon Sep 17 00:00:00 2001 From: yujh_java Date: Wed, 17 Sep 2025 21:48:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93=E4=BF=AE=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=BD=93=E5=8C=96=E4=BA=8B=E4=B8=9A=E9=83=A8BI=E6=B1=87?= =?UTF-8?q?=E6=80=BBsql=E9=80=BB=E8=BE=91-4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SaleDataSummaryServiceImpl.java | 31 +++---------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java index 046e2e7..a8c5846 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java @@ -593,34 +593,11 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { Calendar endCal = Calendar.getInstance(); endCal.setTime(dateRange.getEndDate()); endCal.set(Calendar.DAY_OF_MONTH, endCal.getActualMaximum(Calendar.DAY_OF_MONTH)); // 设置为月份的最后一天 - + int year = startCal.get(Calendar.YEAR); + int month = startCal.get(Calendar.MONTH) + 1; Calendar monthCal = (Calendar) startCal.clone(); - - while (!monthCal.after(endCal)) { - int year = monthCal.get(Calendar.YEAR); - int month = monthCal.get(Calendar.MONTH) + 1; - String yearMonth = String.format("%04d-%02d", year, month); - - LOGGER.info("计算月度汇总数据: {}-{}", year, month); - - // 1. 产品配套率年度数据 -// calculateAndSaveMatchingRate(year, month, yearMonth, bkgs); - - // 2. 产品销售月明细数据 -// calculateAndSaveProductMonthly(year, month, yearMonth, bkgs); - - // 3. 应收账款品牌月明细 -// calculateAndSaveReceivableBrandMonthly(year, month, yearMonth, bkgs); - - // 4. 应收账款年度汇总 -// calculateAndSaveReceivableYear(year, month, yearMonth, bkgs); - - // 5. 营业收入年度汇总 - calculateAndSaveRevenueYear(startDate,year, month, yearMonth, bkgs); - - // 移动到下个月 - monthCal.add(Calendar.MONTH, 1); - } + String yearMonth = String.format("%04d-%02d", year, month); + calculateAndSaveRevenueYear(startDate,year, month, yearMonth, bkgs); } /**