经营报表

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/OperatingReportNewDao.java

@@ -97,4 +97,7 @@ public interface OperatingReportNewDao extends BaseDAO<Integer, OperatingReportN
 
     //统计当月亏损的云教练金额
     List<Map<Integer,BigDecimal>> sumLossCloudAmount(@Param("month") String month);
+
+    //课程未开始团体云教练预收
+    List<Map<Integer,BigDecimal>> sumNotStartCloudPreAmount();
 }

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

@@ -94,6 +94,8 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 		Map<Integer, BigDecimal> collect10 = MapUtil.convertIntegerMap(operatingReportNewDao.sumGroupCloudPreAmount(currentMonth,lastDayOfMonth));
 		//未生效云教练预收款
 		Map<Integer, BigDecimal> collect25 = MapUtil.convertIntegerMap(operatingReportNewDao.sumWaitCloudPreAmount());
+		//已排课但是课程未开始的云教练预收
+		Map<Integer, BigDecimal> collect27 = MapUtil.convertIntegerMap(operatingReportNewDao.sumNotStartCloudPreAmount());
 
 		//课程预收
 		//云教练赠课预收
@@ -157,7 +159,10 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 			operatingReportNew.setTotalCost(operatingReportNew.getBusinessRefund().
 					add(operatingReportNew.getFixedCosts()).add(operatingReportNew.getVariableCosts()));
 
-			operatingReportNew.setCloudPrepaidFee(getAmount(collect9.get(organId)).add(getAmount(collect10.get(organId))).add(getAmount(collect25.get(organId))));
+			operatingReportNew.setCloudPrepaidFee(getAmount(collect9.get(organId)).
+					add(getAmount(collect10.get(organId))).
+					add(getAmount(collect27.get(organId))).
+					add(getAmount(collect25.get(organId))));
 			operatingReportNew.setCoursePrepaidFee(getAmount(collect11.get(organId)).add(getAmount(collect12.get(organId))).
 					add(getAmount(collect20.get(organId))).add(getAmount(collect21.get(organId))).add(getAmount(collect23.get(organId))));
 			operatingReportNew.setSalePrepaidFee(getAmount(collect13.get(organId)));

mec-biz/src/main/resources/config/mybatis/OperatingReportNewMapper.xml

@@ -336,4 +336,9 @@
 		select organ_id_ 'key',SUM(cloud_price_) 'value' from operating_report_cloud where cloud_price_ < 0 AND DATE_FORMAT(start_date_,'%Y-m%') = #{month}
 		group by organ_id_;
 	</select>
+	<select id="sumNotStartCloudPreAmount" resultType="java.util.Map">
+		select orc.organ_id_ 'key',SUM(orc.cloud_price_) 'value' from operating_report_cloud orc
+		where orc.start_date_ IS NULL AND orc.course_price_ > 0
+		group by orc.organ_id_
+	</select>
 </mapper>