Merge branch 'zx_2023-03_cloud' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ExportEnum.java

@@ -87,6 +87,7 @@ public enum ExportEnum implements BaseEnum<String, ExportEnum> {
     EXPORT_CLOUD_TEACHER_SUM("EXPORT_CLOUD_TEACHER_SUM", "云教练统计导出"),
     EXPORT_CLOUD_TEACHER_SUM_DETAIL("EXPORT_CLOUD_TEACHER_SUM_DETAIL", "云教练统计详情导出"),
     EXPORT_INDEX_COOP("EXPORT_INDEX_COOP", "首页经营数据合作单位导出"),
+    EXPORT_TEACHER_CLOUD_COURSE_REPORT("EXPORT_TEACHER_CLOUD_COURSE_REPORT","老师课程云教练使用时长"),
     ;
 
     private String code;

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ExportTypeEnum.java

@@ -25,7 +25,8 @@ public enum ExportTypeEnum implements BaseEnum<Integer, ExportTypeEnum> {
 	EXPORT_COURSE_CONSUMER_SUM(19, "课耗统计导出"),
 	EXPORT_CLOUD_TEACHER_SUM(20, "云教练统计导出"),
 	CLASS_GROUP(21, "班级列表导出"),
-	EXPORT_CLOUD_TEACHER_SUM_DETAIL(22, "云教练统计详情导出")
+	EXPORT_CLOUD_TEACHER_SUM_DETAIL(22, "云教练统计详情导出"),
+	EXPORT_TEACHER_CLOUD_COURSE_REPORT(23, "老师课程云教练使用时长")
 	;
 
 	private Integer code;

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.*;
+import com.ym.mec.biz.dal.vo.TeacherCloudCourseReportDto;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.controller.BaseController;
@@ -188,7 +189,7 @@ public class ExportServiceImpl implements ExportService {
     @Autowired
     private StudentTeacherMapperDao studentTeacherMapperDao;
     @Autowired
-    private SchoolDao schoolDao;
+    private TeacherCloudCourseReportService teacherCloudCourseReportService;
 
     private static final ExecutorService exportExecutorService = Executors.newFixedThreadPool(10);
     @Autowired
@@ -381,6 +382,7 @@ public class ExportServiceImpl implements ExportService {
         exportManageFuncMap.put(ExportEnum.EXPORT_CLOUD_TEACHER_SUM, (info) -> exportCloudTeacherSum(info));
         exportManageFuncMap.put(ExportEnum.EXPORT_CLOUD_TEACHER_SUM_DETAIL, (info) -> exportCloudTeacherSumDetail(info));
         exportManageFuncMap.put(ExportEnum.CLASS_GROUP, info -> exportClassGroup(info));
+        exportManageFuncMap.put(ExportEnum.EXPORT_TEACHER_CLOUD_COURSE_REPORT, info -> exportTeacherCloudCourseReport(info));
     }
 
     private List<StudentServeExportDto> exportStudentServeInfo(Map<String, Object> info) {
@@ -1547,6 +1549,17 @@ public class ExportServiceImpl implements ExportService {
                 managerDownload.getName());
     }
 
+    private HttpResponseResult exportTeacherCloudCourseReport(Map<String, Object> info){
+        TeacherCloudCourseReportQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), TeacherCloudCourseReportQueryInfo.class);
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+        List<TeacherCloudCourseReportDto> rows = teacherCloudCourseReportService.queryReportPage(queryInfo).getRows();
+        checkRows(rows);
+        SysUser user = sysUserService.getUser();
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_TEACHER_CLOUD_COURSE_REPORT,user.getId());
+        return this.asyncExport(() -> this.initExportInfo(rows, managerDownload,ExportEnum.EXPORT_TEACHER_CLOUD_COURSE_REPORT),
+                managerDownload.getName());
+    }
+
     private HttpResponseResult exportClassGroup(Map<String, Object> info){
         SysUser user = sysUserService.getUser();
         ClassGroupQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), ClassGroupQueryInfo.class);

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

@@ -56,8 +56,9 @@
 			</if>
 		</where>
 		group by tccr.teacher_id_
+		order by tccr.organ_id_,
 		<if test="sort != null and sort != ''">
-			order by ${sort} ${order}
+			,${sort} ${order}
 		</if>
 		<include refid="global.limit"/>
 	</select>

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

@@ -337,3 +337,7 @@ fieldColumns = ["musicGroupId", "musicGroupName", "organName", "name","type.msg"
 [首页经营数据合作单位导出]
 headColumns = ["合作单位", "总金额"]
 fieldColumns = ["name", "amount"]
+
+[老师课程云教练使用时长]
+headColumns = ["分部", "老师姓名", "声部", "课程时长（分）", "云教练使用时长（分）"]
+fieldColumns = ["organName", "teacherName", "subjectName", "courseTime", "playTime"]