经营报表

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

@@ -88,4 +88,7 @@ public interface OperatingReportNewDao extends BaseDAO<Integer, OperatingReportN
 
     //导入的服务收入
     List<Map<Integer,BigDecimal>> sumImportServerOrderAmount(@Param("month") String month);
+
+    //获取待生效云教练预收
+    List<Map<Integer,BigDecimal>> sumWaitCloudPreAmount();
 }

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

@@ -87,6 +87,8 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 		Map<Integer, BigDecimal> collect9 = MapUtil.convertIntegerMap(operatingReportNewDao.sumCloudPreAmount(currentMonth,lastDayOfMonth));
 		//团体云教练预收款
 		Map<Integer, BigDecimal> collect10 = MapUtil.convertIntegerMap(operatingReportNewDao.sumGroupCloudPreAmount(currentMonth,lastDayOfMonth));
+		//未生效云教练预收款
+		Map<Integer, BigDecimal> collect25 = MapUtil.convertIntegerMap(operatingReportNewDao.sumWaitCloudPreAmount());
 
 		//课程预收
 		//云教练赠课预收
@@ -145,7 +147,7 @@ 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))));
+			operatingReportNew.setCloudPrepaidFee(getAmount(collect9.get(organId)).add(getAmount(collect10.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

@@ -318,4 +318,9 @@
 		where spo.group_type_ = 'OUTORDER' AND DATE_FORMAT(spo.create_time_,'%Y-%m') = #{month}
 		GROUP BY spo.organ_id_;
 	</select>
+	<select id="sumWaitCloudPreAmount" resultType="java.util.Map">
+		select cto.organ_id_ 'key',SUM(cto.operating_amount_) 'value' from cloud_teacher_order cto
+		where cto.status_ = 1 AND cto.operating_amount_ > 0
+		group by cto.organ_id_;
+	</select>
 </mapper>