线上基础技能课与乐团网管课课酬结算规则调整

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

@@ -543,7 +543,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         if(!CollectionUtils.isEmpty(studentAttendances)){
             courseNormalStudentsMap =studentAttendances.stream()
                     .filter(studentAttendance -> StudentAttendanceStatusEnum.NORMAL.equals(studentAttendance.getStatus()))
-                    .collect(Collectors.groupingBy(StudentAttendance::getId, Collectors.counting()));
+                    .collect(Collectors.groupingBy(StudentAttendance::getCourseScheduleId, Collectors.counting()));
         }
 
         //课程对应乐团结算方式集合

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

@@ -3030,15 +3030,15 @@
 
     <select id="getVipGroupExport" resultMap="com.ym.mec.biz.dal.dao.PracticeGroupDao.courseGroupExport">
         SELECT cssp.user_id_ student_id_,
-        su.username_ student_name_,
-        o.name_ organ_name_,
-        GROUP_CONCAT(DISTINCT edut.`real_name_`) edu_teacher_name_,
-        GROUP_CONCAT(DISTINCT edut.`id_`) edu_teacher_ids_
+            su.username_ student_name_,
+            o.name_ organ_name_,
+            GROUP_CONCAT(DISTINCT edut.`real_name_`) edu_teacher_name_,
+            GROUP_CONCAT(DISTINCT edut.`id_`) edu_teacher_ids_
         FROM `course_schedule_student_payment` cssp
-        LEFT JOIN `vip_group` vg ON vg.`id_` = cssp.`music_group_id_` AND cssp.`group_type_` = 'VIP'
-        LEFT JOIN `organization` o ON o.`id_` = vg.`organ_id_`
-        LEFT JOIN `sys_user` su ON su.`id_` = cssp.`user_id_`
-        LEFT JOIN `sys_user` edut ON edut.`id_` = vg.`educational_teacher_id_`
+            LEFT JOIN `vip_group` vg ON vg.`id_` = cssp.`music_group_id_` AND cssp.`group_type_` = 'VIP'
+            LEFT JOIN `organization` o ON o.`id_` = vg.`organ_id_`
+            LEFT JOIN `sys_user` su ON su.`id_` = cssp.`user_id_`
+            LEFT JOIN `sys_user` edut ON edut.`id_` = vg.`educational_teacher_id_`
         WHERE cssp.`group_type_` = 'VIP'
         AND vg.group_status_!=3
         <if test="organIds != null and organIds != ''">

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -806,7 +806,7 @@ public class ExportController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && queryInfo.getOrderType().equals("3")) {
+            if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && "3".equals(queryInfo.getOrderType())) {
                 queryInfo.setRoutingOrganId(employee.getOrganIdList());
             } else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());