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 af3317c..046e2e7 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 @@ -589,7 +589,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { Calendar startCal = Calendar.getInstance(); startCal.setTime(dateRange.getStartDate()); startCal.set(Calendar.DAY_OF_MONTH, 1); // 设置为月份的第一天 - + String startDate = DATE_FORMAT.format(dateRange.getStartDate()); Calendar endCal = Calendar.getInstance(); endCal.setTime(dateRange.getEndDate()); endCal.set(Calendar.DAY_OF_MONTH, endCal.getActualMaximum(Calendar.DAY_OF_MONTH)); // 设置为月份的最后一天 @@ -616,7 +616,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { // calculateAndSaveReceivableYear(year, month, yearMonth, bkgs); // 5. 营业收入年度汇总 - //calculateAndSaveRevenueYear(year, month, yearMonth, bkgs); + calculateAndSaveRevenueYear(startDate,year, month, yearMonth, bkgs); // 移动到下个月 monthCal.add(Calendar.MONTH, 1);