经营报表数据统计

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OperatingReportNewServiceImpl.java

@@ -52,10 +52,10 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void operatingReportMonth(Date month) {
-		String firstDayOfMonth = DateUtil.dateToString(DateUtil.getFirstDayOfMonth(month),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+//		String firstDayOfMonth = DateUtil.dateToString(DateUtil.getFirstDayOfMonth(month),DateUtil.ISO_EXPANDED_DATE_FORMAT);
 		String lastDayOfMonth = DateUtil.dateToString(DateUtil.getLastDayOfMonth(month),DateUtil.ISO_EXPANDED_DATE_FORMAT);
 		String currentMonth = DateUtil.dateToString(DateUtil.getLastDayOfMonth(month),DateUtil.ISO_YEAR_MONTH_FORMAT);
-		String currentYear = DateUtil.dateToString(DateUtil.getLastDayOfMonth(month),DateUtil.ISO_YEAR_FORMAT);
+//		String currentYear = DateUtil.dateToString(DateUtil.getLastDayOfMonth(month),DateUtil.ISO_YEAR_FORMAT);
 		operatingReportNewDao.deleteByMonth(currentMonth);
 		List<OperatingReportNew> operatingList = operatingReportNewDao.initOperatingReport(currentMonth);
 		//更新团体云教练计费时间()
@@ -69,11 +69,11 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 		Map<Integer, OperatingReportNew> collect = sellList.stream().collect(Collectors.groupingBy(OperatingReportNew::getOrganId,Collectors.collectingAndThen(Collectors.toList(),value->value.get(0))));
 		//分部销售收入
 		Map<String, Object> paramMap = new HashMap<>(1);
-		paramMap.put("month",month);
+		paramMap.put("month",currentMonth);
 		List<OperatingTotalIncomeDto> incomeDtos = studentPaymentOrderService.queryOperatingSummaryIncome(paramMap);
 		Map<Integer, OperatingTotalIncomeDto> incomeDtoMap = incomeDtos.stream().collect(Collectors.groupingBy(e -> e.getOrganId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
 		//服务收入
-		//导入的服务收入  (全部记录为课程收入)
+/*		//导入的服务收入  (全部记录为课程收入)
 		Map<Integer, BigDecimal> collect24 = MapUtil.convertIntegerMap(operatingReportNewDao.sumImportServerOrderAmount(currentMonth));
 		//付费课程实际收入
 		Map<Integer, BigDecimal> collect2 = MapUtil.convertIntegerMap(operatingReportNewDao.sumCourseAmount(firstDayOfMonth,lastDayOfMonth,currentYear));
@@ -83,9 +83,9 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 		Map<Integer, BigDecimal> collect4 = MapUtil.convertIntegerMap(operatingReportNewDao.sumGroupCloudAmount(currentMonth,firstDayOfMonth,lastDayOfMonth));
 		//团体云教练当月一次性结转
 		Map<Integer, BigDecimal> collect5 = MapUtil.convertIntegerMap(operatingReportNewDao.sumGroupAmount(currentMonth));
-
 		//乐保实收
-		Map<Integer, BigDecimal> collect26 = MapUtil.convertIntegerMap(operatingReportNewDao.sumMaintenanceAmount(currentMonth));
+		Map<Integer, BigDecimal> collect26 = MapUtil.convertIntegerMap(operatingReportNewDao.sumMaintenanceAmount(currentMonth));*/
+
 		//业务退费
 		Map<Integer, BigDecimal> collect6 = MapUtil.convertIntegerMap(operatingReportNewDao.sumRefundAmount(currentMonth));
 		//变动费用
@@ -144,6 +144,8 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 			if(Objects.nonNull(incomeDto)){
 				//销售收入
 				operatingReportNew.setSaleAmount(incomeDto.getSalesIncome());
+				//服务收入
+				operatingReportNew.setServiceAmount(incomeDto.getServiceIncome());
 			}
 			OperatingReportNew reportNew = collect.get(organId);
 			if(Objects.nonNull(reportNew)){
@@ -157,14 +159,14 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 			//业务退费
 			operatingReportNew.setBusinessRefund(getAmount(collect6.get(organId)));
 			//服务收入
-			operatingReportNew.setServiceAmount(
-					getAmount(collect3.get(organId))
-					.add(getAmount(collect2.get(organId)))
-					.add(getAmount(collect4.get(organId)))
-					.add(getAmount(collect5.get(organId)))
-					.add(getAmount(collect24.get(organId)))
-					.add(getAmount(collect26.get(organId)))
-					.add(operatingReportNew.getCourseAmount()));
+//			operatingReportNew.setServiceAmount(
+//					getAmount(collect3.get(organId))
+//					.add(getAmount(collect2.get(organId)))
+//					.add(getAmount(collect4.get(organId)))
+//					.add(getAmount(collect5.get(organId)))
+//					.add(getAmount(collect24.get(organId)))
+//					.add(getAmount(collect26.get(organId)))
+//					.add(operatingReportNew.getCourseAmount()));
 			//收入合计
 			operatingReportNew.setTotalIncome(operatingReportNew.getSaleAmount().add(operatingReportNew.getServiceAmount()).subtract(operatingReportNew.getBusinessRefund()));
 			//内部结算