course_schedule 添加逻辑删除

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

@@ -371,8 +371,8 @@ headColumns = ["分部","学员编号","学员姓名","手机号","学员声部"
 fieldColumns = ["organName","studentId","name","phone","subjectName","type.msg","time","amount","status == 1 ? '待激活':'已取消'","cancelReason","operatorName","operateTime","createTime"]
 
 [平衡关系-乐团课]
-headColumns = ["分部","乐团名称","乐团编号","班级名称","班级类型","班级编号","课程类型","期初预收款","期初剩余课次","期初课酬","期初被合并课预收款","期初被合并课剩余课次","期初被合并课课酬","当月新增预收","当月新增课酬","当月新增课次","当月被合并新增预收","当月被合并新增课酬","当月被合并新增课次","当月课耗收入","当月消耗课酬","当月消耗课次","当月被合并课耗收入","当月被合并消耗课酬","当月被合并消耗课次","期末预收款","期末剩余课次","期末课酬","期末被合并课预收款","期末被合并课剩余课次","期末被合并课课酬"]
-fieldColumns = ["organName","musicGroupName","musicGroupId","className","classType","classId","courseType","firstMonthPreAmount","firstMonthSubCourseNum","firstMonthCourseSalary","firstMonthPreMergeAmount","firstMonthSubMergeCourseNum","firstMonthMergeCourseSalary","currentMonthAddCourseAmount","currentMonthAddReward","currentMonthAdd","currentMonthAddMergeCourseAmount","currentMonthMergedAddReward","currentMonthMergedAdd","currentMonthCourseAmount","currentMonthConsumeReward","currentMonthConsume","currentMonthMergeCourseAmount","currentMonthMergedConsumeReward","currentMonthMergedConsume","lastMonthPreAmount","lastMonthSubCourseNum","lastMonthCourseSalary","lastMonthPreMergeAmount","lastMonthSubMergeCourseNum","lastMonthMergeCourseSalary"]
+headColumns = ["分部","乐团名称","乐团编号","班级名称","班级类型","班级编号","课程类型","期初预收款","期初剩余课次","期初课酬","期初被合并课预收款","期初被合并课剩余课次","期初被合并课课酬","当月新增预收","当月新增课酬","当月新增课次","当月被合并新增预收","当月被合并新增课酬","当月被合并新增课次","当月课耗收入","当月消耗课酬","当月消耗课次","当月被合并课耗收入","当月被合并消耗课酬","当月被合并消耗课次","期末预收款","期末剩余课次","期末课酬","期末被合并课预收款","期末被合并课剩余课次","期末被合并课课酬","被删除课次"]
+fieldColumns = ["organName","musicGroupName","musicGroupId","className","classType","classId","courseType","firstMonthPreAmount","firstMonthSubCourseNum","firstMonthCourseSalary","firstMonthPreMergeAmount","firstMonthSubMergeCourseNum","firstMonthMergeCourseSalary","currentMonthAddCourseAmount","currentMonthAddReward","currentMonthAdd","currentMonthAddMergeCourseAmount","currentMonthMergedAddReward","currentMonthMergedAdd","currentMonthCourseAmount","currentMonthConsumeReward","currentMonthConsume","currentMonthMergeCourseAmount","currentMonthMergedConsumeReward","currentMonthMergedConsume","lastMonthPreAmount","lastMonthSubCourseNum","lastMonthCourseSalary","lastMonthPreMergeAmount","lastMonthSubMergeCourseNum","lastMonthMergeCourseSalary","delCourseNum"]
 
 [平衡关系-乐团课汇总]
 headColumns = ["期初预收款","期初剩余课次","期初课酬","当月新增预收","当月新增课酬","当月新增课次","当月课耗收入","当月消耗课酬","当月消耗课次","期末预收款","期末剩余课次","期末课酬"]

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

@@ -352,6 +352,9 @@ public class ExportWrapper {
 
         @ApiModelProperty("期末被合并课课酬")
         private String lastMonthMergeCourseSalary;
+
+        @ApiModelProperty("被删除课次")
+        private Integer delCourseNum;
     }
     @Data
     @ApiModel("平衡关系-乐团课汇总")

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

@@ -31,14 +31,14 @@
                     WHEN mm.course_type_ = 'HIGH_ONLINE' THEN '线上基础技能课'
                     WHEN mm.course_type_ = 'MUSIC_NETWORK' THEN '乐团网管课'
                     WHEN mm.course_type_ = 'LIVE' THEN '直播课' END courseType,
-               first_month_pre_amount_ firstMonthPreAmount, first_month_sub_course_num_ firstMonthSubCourseNum,
-               first_month_course_salary_ firstMonthCourseSalary, first_month_pre_merge_amount_ firstMonthPreMergeAmount, first_month_sub_merge_course_num_ firstMonthSubMergeCourseNum,
-               first_month_merge_course_salary_ firstMonthMergeCourseSalary, current_month_add_course_amount_ currentMonthAddCourseAmount, current_month_add_course_num_ currentMonthAdd,
-               current_month_add_course_salary_ currentMonthAddReward, current_month_add_merge_course_amount_ currentMonthAddMergeCourseAmount, current_month_add_merge_course_num_ currentMonthMergedAdd,
-               current_month_add_merge_course_salary_ currentMonthMergedAddReward, current_month_consume_course_num_ currentMonthConsume, current_month_course_salary_ currentMonthConsumeReward,
-               current_month_course_amount_ currentMonthCourseAmount, current_month_consume_merge_course_num_ currentMonthMergedConsume, current_month_merge_course_salary_ currentMonthMergedConsumeReward,
-               current_month_merge_course_amount_ currentMonthMergeCourseAmount, last_month_pre_amount_ lastMonthPreAmount, last_month_sub_course_num_ lastMonthSubCourseNum, last_month_course_salary_ lastMonthCourseSalary,
-               last_month_pre_merge_amount_ lastMonthPreMergeAmount, last_month_sub_merge_course_num_ lastMonthSubMergeCourseNum, last_month_merge_course_salary_ lastMonthMergeCourseSalary
+               mm.first_month_pre_amount_ firstMonthPreAmount, mm.first_month_sub_course_num_ firstMonthSubCourseNum,
+               mm.first_month_course_salary_ firstMonthCourseSalary, mm.first_month_pre_merge_amount_ firstMonthPreMergeAmount, mm.first_month_sub_merge_course_num_ firstMonthSubMergeCourseNum,
+               mm.first_month_merge_course_salary_ firstMonthMergeCourseSalary, mm.current_month_add_course_amount_ currentMonthAddCourseAmount, mm.current_month_add_course_num_ currentMonthAdd,
+               mm.current_month_add_course_salary_ currentMonthAddReward, mm.current_month_add_merge_course_amount_ currentMonthAddMergeCourseAmount, mm.current_month_add_merge_course_num_ currentMonthMergedAdd,
+               mm.current_month_add_merge_course_salary_ currentMonthMergedAddReward, mm.current_month_consume_course_num_ currentMonthConsume, mm.current_month_course_salary_ currentMonthConsumeReward,
+               mm.current_month_course_amount_ currentMonthCourseAmount, mm.current_month_consume_merge_course_num_ currentMonthMergedConsume, mm.current_month_merge_course_salary_ currentMonthMergedConsumeReward,
+               mm.current_month_merge_course_amount_ currentMonthMergeCourseAmount, mm.last_month_pre_amount_ lastMonthPreAmount, mm.last_month_sub_course_num_ lastMonthSubCourseNum, mm.last_month_course_salary_ lastMonthCourseSalary,
+               mm.last_month_pre_merge_amount_ lastMonthPreMergeAmount, mm.last_month_sub_merge_course_num_ lastMonthSubMergeCourseNum, mm.last_month_merge_course_salary_ lastMonthMergeCourseSalary,mm.del_course_num_ delCourseNum
         from month_music_class_report_statis mm
                  left join class_group cg ON cg.id_ = mm.class_group_id_
                  left join music_group mg ON mg.id_ = cg.music_group_id_