zouxuan 1 год назад
Родитель
Сommit
d9a0c75678

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CloudTeacherOrderDao.java

@@ -129,5 +129,5 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
 
     List<CloudCoachActivationDetailsDto> exportCloudCoachActivationDetails(@Param("month") String month, @Param("organId") String organId);
 
-    List<CloudCoachActivationDetailsDto> exportCloudTeacherOrderInactive(@Param("organId") String organId);
+    List<CloudCoachActivationDetailsDto> exportMusicGroupNoCourse(@Param("organId") String organId);
 }

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

@@ -354,7 +354,8 @@ public class ExportServiceImpl implements ExportService {
         exportFuncMap.put(ExportEnum.EXPORT_OPERATING_REPORT_NEW, (info) -> exportOperatingNew(info));
         exportFuncMap.put(ExportEnum.EXPORT_INDEX_COOP, (info) -> exportIndexCoop(info));
         exportFuncMap.put(ExportEnum.CLOUD_COACH_ACTIVATION_DETAILS, info -> exportCloudCoachActivationDetails(info));
-        exportFuncMap.put(ExportEnum.EXPORT_CLOUD_TEACHER_ORDER_INACTIVE, info -> exportCloudTeacherOrderInactive(info));
+        exportFuncMap.put(ExportEnum.EXPORT_CLOUD_TEACHER_ORDER_INACTIVE, info -> exportCloudTeacherOrderInActive(info));
+        exportFuncMap.put(ExportEnum.EXPORT_MUSIC_GROUP_NO_COURSE, info -> exportMusicGroupNoCourse(info));
 
 
         //导出到报表中心
@@ -491,11 +492,12 @@ public class ExportServiceImpl implements ExportService {
         return cloudTeacherOrderDao.exportCloudCoachActivationDetails(month,organId);
     }
 
-    private List<CloudCoachActivationDetailsDto> exportCloudTeacherOrderInactive(Map<String, Object> info) {
+    private List<CloudCoachActivationDetailsDto> exportMusicGroupNoCourse(Map<String, Object> info) {
         String organId = getParam(info, "organId", String.class);
-        return cloudTeacherOrderDao.exportCloudTeacherOrderInactive(organId);
+        return cloudTeacherOrderDao.exportMusicGroupNoCourse(organId);
     }
 
+
     private List<CloudTeacherStudent> exportCloudTeacherOrderInActive(Map<String, Object> info) {
         CloudTeacherOrderQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), CloudTeacherOrderQueryInfo.class);
         Integer tenantId = TenantContextHolder.getTenantId();

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/CloudTeacherOrderMapper.xml

@@ -587,7 +587,7 @@
         </if>
         ORDER BY o.id_ DESC,cto.start_time_ DESC
     </select>
-    <select id="exportCloudTeacherOrderInactive"
+    <select id="exportMusicGroupNoCourse"
             resultType="com.ym.mec.biz.dal.dto.CloudCoachActivationDetailsDto">
         select o.name_ organName,mg.name_ musicGroupName,mg.id_ musicGroupId,mgpscd.user_id_ studentId,su.username_ studentName,
         sum(CASE WHEN mgpscd.course_type_ = 'CLASSROOM' THEN mgpscd.sub_course_minutes_ ELSE 0 END) AS classroom,