|
|
@@ -52,9 +52,9 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
|
|
|
//更新团体云教练计费时间()
|
|
|
operatingReportNewDao.initCloudStartTime(lastDayOfMonth);
|
|
|
//标记缴费项目为已结算(已排课，并且在上个月有关联的课程)
|
|
|
-// operatingReportCloudDao.settlementCalender(currentMonth);
|
|
|
+ operatingReportCloudDao.settlementCalender(currentMonth);
|
|
|
//标记当月结算的缴费项目(缴费项目结算后缴费、或者进行中加学员的都算当月结算)
|
|
|
-// operatingReportCloudDao.settlementCurrentCalender(currentMonth);
|
|
|
+ operatingReportCloudDao.settlementCurrentCalender(currentMonth);
|
|
|
//销售收入、销售成本
|
|
|
List<OperatingReportNew> sellList = operatingReportNewDao.sumSellAmount(currentMonth);
|
|
|
Map<Integer, OperatingReportNew> collect = sellList.stream().collect(Collectors.groupingBy(OperatingReportNew::getOrganId,Collectors.collectingAndThen(Collectors.toList(),value->value.get(0))));
|
zouxuan