Merge branch 'zx_saas_export_0814' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/resources/exportColumnMapper.ini

@@ -432,4 +432,8 @@ fieldColumns = ["firstMonthPreCourseAmount","firstMonthPreNoCourseAmount","first
 
 [平衡关系-云教练汇总]
 headColumns = ["期初预收款（已激活）", "期初预收款（待激活）", "期初激活人数", "期初待激活人数", "当月新增预收款（当月购买）", "当月新增人数（当月购买）", "当月续费预收款", "当月续费人数", "当月减少人数（到期）", "当月消耗的云教练金额", "当月退费人数", "当月退费金额", "当月激活人数", "期末预收款（已激活）", "期末预收款（待激活）", "期末激活人数", "期末待激活人数"]
-fieldColumns = ["firstMonthPreAmount", "firstMonthPreWaitAmount", "firstMonthActiveNum", "firstMonthWaitActiveNum", "currentMonthAddPreAmount", "currentMonthAddNum", "currentMonthRenewPreAmount", "currentMonthRenewNum", "currentMonthCutNum", "currentMonthAmount", "currentMonthReturnNum", "currentMonthReturnAmount", "currentMonthActiveNum", "lastMonthPreAmount", "lastMonthPreWaitAmount", "lastMonthActiveNum", "lastMonthWaitActiveNum"]
+fieldColumns = ["firstMonthPreAmount", "firstMonthPreWaitAmount", "firstMonthActiveNum", "firstMonthWaitActiveNum", "currentMonthAddPreAmount", "currentMonthAddNum", "currentMonthRenewPreAmount", "currentMonthRenewNum", "currentMonthCutNum", "currentMonthAmount", "currentMonthReturnNum", "currentMonthReturnAmount", "currentMonthActiveNum", "lastMonthPreAmount", "lastMonthPreWaitAmount", "lastMonthActiveNum", "lastMonthWaitActiveNum"]
+
+[平衡关系-未分班未排课汇总]
+headColumns = ["期初总预收","期末总预收","当月新增总预收"]
+fieldColumns = ["firstTotalCoursePrice","lastTotalCoursePrice","currentTotalCoursePrice"]

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

@@ -549,8 +549,8 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourse(@Param("month") String month,@Param("organIds") String organIds);
 
-    BigDecimal exportBalancedRelationshipMusicNoClassNoCourseSum(@Param("month") String month);
+    BigDecimal exportBalancedRelationshipMusicNoClassNoCourseSum(@Param("month") String month, @Param("organIds") String organIds);
 
     //平衡关系-乐团课
-    ExportWrapper.ExportBalancedRelationshipMusicCourseSum exportBalancedRelationshipMusicCourseSum(@Param("month") String month);
+    ExportWrapper.ExportBalancedRelationshipMusicCourseSum exportBalancedRelationshipMusicCourseSum(@Param("month") String month, @Param("organIds") String organIds);
 }

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

@@ -119,8 +119,10 @@ public interface OperatingReportNewDao extends BaseDAO<Integer, OperatingReportN
     //oa费用明细
     List<FinancialExpenditure> queryOASummaryExpensesDetail(@Param("month") String month);
 
-    void firstBalancedRelationship(@Param("month") String month);
+    void musicBalancedRelationship(@Param("month") String month, @Param("lastMonth") String lastMonth);
 
-    void lastBalancedRelationship(@Param("month") String month);
+    void vipBalancedRelationship(@Param("month") String month, @Param("lastMonth") String lastMonth);
+
+    void cloudBalancedRelationship(@Param("month") String month, @Param("lastMonth") String lastMonth);
 
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ExportWrapper.java

@@ -476,6 +476,9 @@ public class ExportWrapper {
         @ApiModelProperty("课程类型")
         private String courseType;
 
+        @ApiModelProperty("课程类型")
+        private String courseTypeCode;
+
         @ApiModelProperty("老师编号")
         private Integer teacherId;
 

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -489,9 +489,9 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 
     List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourse(String month, String organIds);
 
-    List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourseSum(String month);
+    List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourseSum(String month, String organIds);
 
-    List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month);
+    List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month, String organIds);
 
-    List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String month);
+    List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String month, String organIds);
 }

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

@@ -474,8 +474,9 @@ public class ExportServiceImpl implements ExportService {
     private HttpResponseResult<String> exportBalancedRelationshipMusicCourseSum(Map<String, Object> info){
         String month = getParam(info, "month", String.class);
         SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicCourseSum(month),
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicCourseSum(month,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM),
                 managerDownload.getName());
     }
@@ -558,8 +559,9 @@ public class ExportServiceImpl implements ExportService {
     private HttpResponseResult<String> exportBalancedRelationshipMusicNoCourseSum(Map<String, Object> info){
         String month = getParam(info, "month", String.class);
         SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE_SUM,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoCourseSum(month),
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoCourseSum(month,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE_SUM),
                 managerDownload.getName());
     }
@@ -567,8 +569,9 @@ public class ExportServiceImpl implements ExportService {
     private HttpResponseResult<String> exportBalancedRelationshipMusicNoClassNoCourseSum(Map<String, Object> info){
         String month = getParam(info, "month", String.class);
         SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoClassNoCourseSum(month),
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoClassNoCourseSum(month,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM),
                 managerDownload.getName());
     }
@@ -586,7 +589,6 @@ public class ExportServiceImpl implements ExportService {
     private HttpResponseResult<String> exportBalancedRelationshipVipSubCourseSum(Map<String, Object> info){
         String month = getParam(info, "month", String.class);
         SysUser sysUser = sysUserService.getUser();
-//        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM,sysUser.getId());
         return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseSum(month),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM),

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

@@ -44,6 +44,7 @@ import com.ym.mec.util.json.JsonUtil;
 import com.ym.mec.util.validator.CommonValidator;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -4255,12 +4256,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
     @Override
-    public List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourseSum(String month) {
+    public List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourseSum(String month, String organIds) {
 		List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> result = new ArrayList<>();
 		ExportWrapper.ExportBalancedRelationshipMusicNoCourse sum = new ExportWrapper.ExportBalancedRelationshipMusicNoCourse();
 		//期初已分班未排课
 		List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> first =
-				musicGroupDao.exportBalancedRelationshipMusicNoCourse(month + "-01 00:00:00", null);
+				musicGroupDao.exportBalancedRelationshipMusicNoCourse(month + "-01 00:00:00", organIds);
 		if(CollectionUtils.isNotEmpty(first)){
 			//计算课酬
 			this.createMusicGroupCourseTeacherSalaries(first);
@@ -4272,7 +4273,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 		//期末已分班未排课
 		List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourses =
-				musicGroupDao.exportBalancedRelationshipMusicNoCourse(month + "-31 23:59:59", null);
+				musicGroupDao.exportBalancedRelationshipMusicNoCourse(month + "-31 23:59:59", organIds);
 		if(CollectionUtils.isNotEmpty(exportBalancedRelationshipMusicNoCourses)){
 			//计算课酬
 			this.createMusicGroupCourseTeacherSalaries(exportBalancedRelationshipMusicNoCourses);
@@ -4301,14 +4302,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
     @Override
-    public List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month) {
+    public List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month, String organIds) {
 		List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> result = new ArrayList<>();
 		ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse sum = new ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse();
 		//期初未分班未排课
-		BigDecimal first = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-01 00:00:00");
+		BigDecimal first = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-01 00:00:00",organIds);
 		sum.setFirstTotalCoursePrice(first);
 		//期末未分班未排课
-		BigDecimal last = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-31 23:59:59");
+		BigDecimal last = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-31 23:59:59",organIds);
 		sum.setLastTotalCoursePrice(last);
 		//当月新增未分班未排课(期末-期初)
 		sum.setCurrentTotalCoursePrice(last.subtract(first));
@@ -4317,9 +4318,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
 	@Override
-	public List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String month) {
+	public List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String month,String organIds) {
 		List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> result = new ArrayList<>();
-		ExportWrapper.ExportBalancedRelationshipMusicCourseSum courseSum = musicGroupDao.exportBalancedRelationshipMusicCourseSum(month);
+		ExportWrapper.ExportBalancedRelationshipMusicCourseSum courseSum = musicGroupDao.exportBalancedRelationshipMusicCourseSum(month,organIds);
 		//获取排课日志
 		musicGroupPaymentStudentCourseDetailLogService.lambdaQuery()
 				.gt(MusicGroupPaymentStudentCourseDetailLog::getCreateTime, month + "-01 00:00:00")
@@ -4351,7 +4352,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			Map<String, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(e->e.getCourseScheduleType().getCode(), teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
 
 			TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary =
-					collect.get(StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.HIGH.getCode())? CourseSchedule.CourseScheduleType.HIGH_ONLINE.getCode():noCour.getCourseType());
+					collect.get(StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.HIGH.getCode())? CourseSchedule.CourseScheduleType.HIGH_ONLINE.getCode():noCour.getCourseTypeCode());
 
 			if (teacherDefaultMusicGroupSalary == null) {
 				continue;
@@ -4367,11 +4368,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 			salary = baseSalary.multiply(classTimeDuty).setScale(2, RoundingMode.HALF_UP);
 			//课堂课课酬
-			if (StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.CLASSROOM.getCode())) {
+			if (StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.CLASSROOM.getCode())) {
 				salary = teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary();
 			}
 			//基础技能提高课
-			if (StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.HIGH_ONLINE.getCode()) || StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.HIGH.getCode())) {
+			if (StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.HIGH_ONLINE.getCode()) || StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.HIGH.getCode())) {
 
 				if(StringUtils.isBlank(teacherDefaultMusicGroupSalary.getSalaryRuleJson())){
 					continue;
@@ -4387,7 +4388,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum+"");
 			}
 
-			if (StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.MUSIC_NETWORK.getCode())) {
+			if (StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.MUSIC_NETWORK.getCode())) {
 				salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal("1");
 			}
 

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

@@ -209,13 +209,16 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 
 	@Override
 	public void balancedRelationship(String month) {
-		//月头的数据统计
-		operatingReportNewDao.firstBalancedRelationship(month);
-
-		//上月月末的数据统计
 		//获取上个月时间
 		String lastMonth = DateUtil.dateToString(DateUtil.addMonths(DateUtil.stringToDate(month,DateUtil.ISO_YEAR_MONTH_FORMAT),-1),DateUtil.ISO_YEAR_MONTH_FORMAT);
-		operatingReportNewDao.lastBalancedRelationship(lastMonth);
+		//乐团课
+		operatingReportNewDao.musicBalancedRelationship(month,lastMonth);
+
+		//vip课
+		operatingReportNewDao.vipBalancedRelationship(month,lastMonth);
+
+		//云教练
+		operatingReportNewDao.cloudBalancedRelationship(month,lastMonth);
 	}
 
 	private BigDecimal getAmount(BigDecimal amount){

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

@@ -279,7 +279,7 @@
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipVipSubCourseDetail">
         select sbi.organ_name_ organName,sbi.cooperation_organ_name_ coopName,sbi.user_id_ userId,sbi.user_name_ username,
                vgc.name_ courseType,
-               first_month_pre_course_amount AS firstMonthPreCourseAmount,
+               first_month_pre_course_amount_ AS firstMonthPreCourseAmount,
                first_month_pre_no_course_amount_ AS firstMonthPreNoCourseAmount,
                first_month_sub_course_num_ AS firstMonthSubCourseNum,
                first_month_sub_no_course_num_ AS firstMonthSubNoCourseNum,
@@ -311,6 +311,7 @@
     <select id="exportBalancedRelationshipVipSubCourseSum"
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipVipSubCourseDetail">
         select
+            SUM(mv.first_month_pre_course_amount_) AS firstMonthPreCourseAmount,
             SUM(mv.first_month_pre_no_course_amount_) AS firstMonthPreNoCourseAmount,
             SUM(mv.first_month_sub_course_num_) AS firstMonthSubCourseNum,
             SUM(mv.first_month_sub_no_course_num_) AS firstMonthSubNoCourseNum,

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

@@ -1336,7 +1336,7 @@
     <select id="exportBalancedRelationshipMusicNoCourse"
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipMusicNoCourse">
         select o.name_ organName,mg.name_ musicGroupName,cgtm.user_id_,cgsm.class_group_id_ classId,
-               mgpscd.music_group_id_ musicGroupId,cg.name_ className,cgtm.user_id_ teacherId,
+               mgpscd.music_group_id_ musicGroupId,cg.name_ className,cgtm.user_id_ teacherId,cg.type_ courseTypeCode,
         CASE WHEN cg.type_ = 'NORMAL' THEN '声部班'
         WHEN cg.type_ = 'MIX' THEN '合奏班'
         WHEN cg.type_ = 'HIGH' THEN '基础技能班'
@@ -1364,14 +1364,14 @@
         WHEN mgpscd.course_type_ = 'MUSIC_NETWORK' THEN '乐团网管课'
         WHEN mgpscd.course_type_ = 'LIVE' THEN '直播课' END courseType,
                SUM(mgpscd.sub_course_current_price_) totalCoursePrice,
-               SUM(mgpscd.sub_course_minutes_) subCourseMinutes,COUNT(DISTINCT cgsm.user_id_) studentNum
+        MIN(mgpscd.sub_course_minutes_) subCourseMinutes,COUNT(DISTINCT cgsm.user_id_) studentNum
         from music_group_payment_student_course_detail mgpscd
                  left join class_group_student_mapper cgsm ON cgsm.music_group_id_ = mgpscd.music_group_id_ and cgsm.user_id_ = mgpscd.user_id_ AND cgsm.status_ = 'NORMAL'
                  left join class_group cg ON cg.id_ = cgsm.class_group_id_
                  left join music_group mg ON mg.id_ = cg.music_group_id_
                  left join organization o ON o.id_ = mg.organ_id_
                  left join class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cg.id_ AND cgtm.teacher_role_ = 'BISHOP'
-        where mgpscd.sub_course_current_price_ > 0 AND mgpscd.sub_course_minutes_ > 0
+        where mgpscd.sub_course_current_price_ > 0 AND mgpscd.sub_course_minutes_ > 0 and cgsm.user_id_ = mgpscd.user_id_
           AND (cg.type_ = mgpscd.course_type_ OR
                    (cg.type_ = 'NORMAL' AND mgpscd.course_type_ IN ('SINGLE','TRAINING_SINGLE')) OR
                    (cg.type_ = 'MIX' AND mgpscd.course_type_ IN ('MIX','TRAINING_MIX')) OR cg.type_ = 'SNAP')
@@ -1389,12 +1389,16 @@
         from music_group_payment_student_course_detail mgpscd
         left join (select cgsm.user_id_,cg.type_,cg.music_group_id_,cgsm.class_group_id_  from class_group_student_mapper cgsm
         left join class_group cg ON cg.id_ = cgsm.class_group_id_
+        left join music_group mg ON mg.id_ = cg.music_group_id_
         where cg.group_type_ = 'MUSIC' AND cgsm.status_ = 'NORMAL') cgsm ON cgsm.music_group_id_ = mgpscd.music_group_id_ and cgsm.user_id_ = mgpscd.user_id_
         AND (cgsm.type_ = mgpscd.course_type_ OR
         (cgsm.type_ = 'NORMAL' AND mgpscd.course_type_ IN ('SINGLE','TRAINING_SINGLE')) OR
         (cgsm.type_ = 'MIX' AND mgpscd.course_type_ IN ('MIX','TRAINING_MIX')) OR cgsm.type_ = 'SNAP')
         where mgpscd.sub_course_current_price_ > 0 AND mgpscd.sub_course_minutes_ > 0
-        AND mgpscd.create_time_ &lt;= #{month} AND cgsm.class_group_id_ IS NULL;
+        AND mgpscd.create_time_ &lt;= #{month} AND cgsm.class_group_id_ IS NULL
+        <if test="organIds != null and organIds != ''">
+            AND FIND_IN_SET(mg.organ_id_,#{organIds})
+        </if>
     </select>
     <select id="exportBalancedRelationshipMusicCourseSum"
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipMusicCourseSum">
@@ -1404,6 +1408,13 @@
             SUM(current_month_course_amount_) currentMonthCourseAmount, SUM(last_month_pre_amount_) lastMonthPreAmount,
             SUM(last_month_sub_course_num_) lastMonthSubCourseNum, SUM(last_month_course_salary_) lastMonthCourseSalary
         from month_music_class_report_statis mm
+        <if test="organIds != null and organIds != ''">
+            left join class_group cg ON cg.id_ = mm.class_group_id_
+            left join music_group mg ON mg.id_ = cg.music_group_id_
+        </if>
         where mm.month_ = #{month}
+        <if test="organIds != null and organIds != ''">
+            AND FIND_IN_SET(mg.organ_id_,#{organIds})
+        </if>
     </select>
 </mapper>

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

@@ -428,17 +428,19 @@
 		from human_cost
 		where month_ = #{month} group by organ_id_
 	</select>
-	<update id="firstBalancedRelationship">
+	<update id="musicBalancedRelationship">
 		select firstMonthVipReportStatis(#{month});
+		select currentMonthVipReportStatis(#{lastMonth});
+		select lastMonthVipReportStatis(#{lastMonth});
+	</update>
+	<update id="vipBalancedRelationship">
 		select firstMonthMusicClassReportStatis(#{month});
-		select firstMonthCloudReportStatis(#{month});
+		select currentMonthMusicClassReportStatis(#{lastMonth});
+		select lastMonthMusicClassReportStatis(#{lastMonth});
 	</update>
-	<update id="lastBalancedRelationship">
-		select currentMonthVipReportStatis(#{month});
-		select lastMonthVipReportStatis(#{month});
-		select currentMonthMusicClassReportStatis(#{month});
-		select lastMonthMusicClassReportStatis(#{month});
-		select currentMonthCloudReportStatis(#{month});
-		select lastMonthCloudReportStatis(#{month});
+	<update id="cloudBalancedRelationship">
+		select firstMonthCloudReportStatis(#{month});
+		select currentMonthCloudReportStatis(#{lastMonth});
+		select lastMonthCloudReportStatis(#{lastMonth});
 	</update>
 </mapper>