经营报表

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

@@ -43,7 +43,7 @@ public interface OperatingReportNewDao extends BaseDAO<Integer, OperatingReportN
     List<Map<Integer,BigDecimal>> sumGroupCloudPreAmount(@Param("month") String month, @Param("lastDay") String lastDay);
 
     //团体云教练当月一次性结转
-    List<Map<Integer,BigDecimal>> sumGroupAmount();
+    List<Map<Integer,BigDecimal>> sumGroupAmount(@Param("month") String month);
 
     //云教练赠课预收
     List<Map<Integer,BigDecimal>> sumCloudCoursePreAmount(@Param("lastDay") String lastDay);

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

@@ -73,7 +73,7 @@ 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());
+		Map<Integer, BigDecimal> collect5 = MapUtil.convertIntegerMap(operatingReportNewDao.sumGroupAmount(currentMonth));
 
 		//乐保实收
 		Map<Integer, BigDecimal> collect26 = MapUtil.convertIntegerMap(operatingReportNewDao.sumMaintenanceAmount(currentMonth));

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

@@ -238,7 +238,7 @@
 	<select id="sumGroupAmount" resultType="java.util.Map">
 		select orc.organ_id_ 'key',SUM(orc.cloud_price_) 'value'
 		from operating_report_cloud orc
-		where orc.cloud_price_ > 0 AND orc.month_flag_ = true AND orc.settlement_flag_ = false group by orc.organ_id_;
+		where orc.cloud_price_ > 0 AND orc.month_flag_ = true AND DATE_FORMAT(orc.create_time_,'%Y-%m') = #{month} group by orc.organ_id_;
 	</select>
 	<select id="sumCloudCoursePreAmount" resultType="java.util.Map">
 		SELECT cs.organ_id_ 'key',SUM(ctf.cost_) 'value' FROM cloud_teacher_free_course ctf