|
@@ -299,7 +299,7 @@ public class ExportServiceImpl implements ExportService {
|
|
exportFuncMap.put(ExportEnum.ORGAN_DOUBLE_ELEVEN2021_STATIS, info -> vipGroupActivityService.organDoubleEleven2021Statis(getQueryInfo(info, OrganDoubleEleven2021StatisDto.class, false)));
|
|
exportFuncMap.put(ExportEnum.ORGAN_DOUBLE_ELEVEN2021_STATIS, info -> vipGroupActivityService.organDoubleEleven2021Statis(getQueryInfo(info, OrganDoubleEleven2021StatisDto.class, false)));
|
|
exportFuncMap.put(ExportEnum.USER_CASH_ACCOUNT_DETAIL, info -> sysUserCashAccountDetailDao.exportDetail(getQueryInfo(info, ExportUserAccountQueryInfo.class, true)));
|
|
exportFuncMap.put(ExportEnum.USER_CASH_ACCOUNT_DETAIL, info -> sysUserCashAccountDetailDao.exportDetail(getQueryInfo(info, ExportUserAccountQueryInfo.class, true)));
|
|
exportFuncMap.put(ExportEnum.USER_COURSES_ACCOUNT, info -> sysUserCoursesAccountDetailDao.exportDetail(getQueryInfo(info, ExportUserAccountQueryInfo.class, true)));
|
|
exportFuncMap.put(ExportEnum.USER_COURSES_ACCOUNT, info -> sysUserCoursesAccountDetailDao.exportDetail(getQueryInfo(info, ExportUserAccountQueryInfo.class, true)));
|
|
- exportFuncMap.put(ExportEnum.CLASS_GROUP, info -> exportClassGroup(info));
|
|
|
|
|
|
+
|
|
exportFuncMap.put(ExportEnum.GOODS, info -> goodsService.queryPage(getQueryInfo(info, GoodsQueryInfo.class, false)).getRows());
|
|
exportFuncMap.put(ExportEnum.GOODS, info -> goodsService.queryPage(getQueryInfo(info, GoodsQueryInfo.class, false)).getRows());
|
|
exportFuncMap.put(ExportEnum.VIP_GROUP_ACTIVITY, info -> vipGroupActivityService.exportVipGroupActivity(getQueryInfo(info, VipGroupActivityQueryInfo.class, true)));
|
|
exportFuncMap.put(ExportEnum.VIP_GROUP_ACTIVITY, info -> vipGroupActivityService.exportVipGroupActivity(getQueryInfo(info, VipGroupActivityQueryInfo.class, true)));
|
|
exportFuncMap.put(ExportEnum.EXPORT_STUDENT_ATTENDANCES, info -> studentAttendanceService.exportStudentAttendancesQueryPage(getQueryInfo(info, ExportStudentAttendanceQueryInfo.class, true)).getRows());
|
|
exportFuncMap.put(ExportEnum.EXPORT_STUDENT_ATTENDANCES, info -> studentAttendanceService.exportStudentAttendancesQueryPage(getQueryInfo(info, ExportStudentAttendanceQueryInfo.class, true)).getRows());
|
|
@@ -376,6 +376,7 @@ public class ExportServiceImpl implements ExportService {
|
|
exportManageFuncMap.put(ExportEnum.EXPORT_PRE_COURSE_CONSUMER_DETAIL, (info) -> exportPreCourseConsumerDetail(info));
|
|
exportManageFuncMap.put(ExportEnum.EXPORT_PRE_COURSE_CONSUMER_DETAIL, (info) -> exportPreCourseConsumerDetail(info));
|
|
exportManageFuncMap.put(ExportEnum.EXPORT_COURSE_CONSUMER_SUM, (info) -> exportCourseConsumerSum(info));
|
|
exportManageFuncMap.put(ExportEnum.EXPORT_COURSE_CONSUMER_SUM, (info) -> exportCourseConsumerSum(info));
|
|
exportManageFuncMap.put(ExportEnum.EXPORT_CLOUD_TEACHER_SUM, (info) -> exportCloudTeacherSum(info));
|
|
exportManageFuncMap.put(ExportEnum.EXPORT_CLOUD_TEACHER_SUM, (info) -> exportCloudTeacherSum(info));
|
|
|
|
+ exportManageFuncMap.put(ExportEnum.CLASS_GROUP, info -> exportClassGroup(info));
|
|
}
|
|
}
|
|
|
|
|
|
private List<StudentServeExportDto> exportStudentServeInfo(Map<String, Object> info) {
|
|
private List<StudentServeExportDto> exportStudentServeInfo(Map<String, Object> info) {
|
|
@@ -552,28 +553,6 @@ public class ExportServiceImpl implements ExportService {
|
|
return instruments;
|
|
return instruments;
|
|
}
|
|
}
|
|
|
|
|
|
- //班级列表导出
|
|
|
|
- @Override
|
|
|
|
- public List exportClassGroup(Map<String, Object> info) {
|
|
|
|
- ClassGroupQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), ClassGroupQueryInfo.class);
|
|
|
|
- queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
|
|
|
|
- List<ClassGroupTeachersDto> rows = classGroupService.queryClassGroupPage(queryInfo).getRows();
|
|
|
|
- for (ClassGroupTeachersDto row : rows) {
|
|
|
|
- List<ClassGroupTeacherMapper> classGroupTeacherMapperList = row.getClassGroupTeacherMapperList();
|
|
|
|
- if (classGroupTeacherMapperList.size() > 0) {
|
|
|
|
- List<ClassGroupTeacherMapper> teachingTeachers = classGroupTeacherMapperList.stream().filter(e -> e.getTeacherRole() == TeachTypeEnum.TEACHING).collect(Collectors.toList());
|
|
|
|
- if (teachingTeachers.size() > 0) {
|
|
|
|
- row.setTeachingTeacherName(StringUtils.join(teachingTeachers.stream().map(e -> e.getUserName()).collect(Collectors.toList()), ","));
|
|
|
|
- }
|
|
|
|
- List<ClassGroupTeacherMapper> bishopTeachers = classGroupTeacherMapperList.stream().filter(e -> e.getTeacherRole() == TeachTypeEnum.BISHOP).collect(Collectors.toList());
|
|
|
|
- if (bishopTeachers.size() > 0) {
|
|
|
|
- row.setBishopTeacherName(StringUtils.join(bishopTeachers.stream().map(e -> e.getUserName()).collect(Collectors.toList()), ","));
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- return rows;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
//导出老师结转奖励
|
|
//导出老师结转奖励
|
|
@Override
|
|
@Override
|
|
public List teacherCourseReward(Map<String, Object> info) {
|
|
public List teacherCourseReward(Map<String, Object> info) {
|
|
@@ -1555,14 +1534,26 @@ public class ExportServiceImpl implements ExportService {
|
|
return this.asyncExport(() -> this.initExportInfo(dtos, managerDownload,ExportEnum.EXPORT_COURSE_CONSUMER_SUM),
|
|
return this.asyncExport(() -> this.initExportInfo(dtos, managerDownload,ExportEnum.EXPORT_COURSE_CONSUMER_SUM),
|
|
managerDownload.getName());
|
|
managerDownload.getName());
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ private HttpResponseResult exportClassGroup(Map<String, Object> info){
|
|
|
|
+ SysUser user = sysUserService.getUser();
|
|
|
|
+ ClassGroupQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), ClassGroupQueryInfo.class);
|
|
|
|
+ queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
|
|
|
|
+ List<ClassGroupTeachersDto> rows = classGroupService.queryClassGroupPage(queryInfo).getRows();
|
|
|
|
+ checkRows(rows);
|
|
|
|
+ ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.CLASS_GROUP,user.getId());
|
|
|
|
+ return this.asyncExport(() -> this.initExportInfo(rows, managerDownload,ExportEnum.CLASS_GROUP),
|
|
|
|
+ managerDownload.getName());
|
|
|
|
+ }
|
|
|
|
+
|
|
private HttpResponseResult exportCloudTeacherSum(Map<String, Object> info){
|
|
private HttpResponseResult exportCloudTeacherSum(Map<String, Object> info){
|
|
StudentCourseConsumerQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), StudentCourseConsumerQueryInfo.class);
|
|
StudentCourseConsumerQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), StudentCourseConsumerQueryInfo.class);
|
|
SysUser user = sysUserService.getUser();
|
|
SysUser user = sysUserService.getUser();
|
|
queryInfo.setOrganId(organizationService.getEmployeeOrgan(user.getId(), queryInfo.getOrganId(), user.getIsSuperAdmin()));
|
|
queryInfo.setOrganId(organizationService.getEmployeeOrgan(user.getId(), queryInfo.getOrganId(), user.getIsSuperAdmin()));
|
|
- List<CloudTeacherSumDto> dtos = studentService.cloudTeacherSum(queryInfo);
|
|
|
|
- checkRows(dtos);
|
|
|
|
|
|
+ int count = studentService.getDao().countTeacherSum(queryInfo);
|
|
|
|
+ checkRows(count);
|
|
ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_CLOUD_TEACHER_SUM,user.getId());
|
|
ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_CLOUD_TEACHER_SUM,user.getId());
|
|
- return this.asyncExport(() -> this.initExportInfo(dtos, managerDownload,ExportEnum.EXPORT_CLOUD_TEACHER_SUM),
|
|
|
|
|
|
+ return this.asyncExport(() -> this.initExportInfo(studentService.cloudTeacherSum(queryInfo), managerDownload,ExportEnum.EXPORT_CLOUD_TEACHER_SUM),
|
|
managerDownload.getName());
|
|
managerDownload.getName());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2847,15 +2838,14 @@ public class ExportServiceImpl implements ExportService {
|
|
try {
|
|
try {
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学生姓名", "学员编号", "联系电话", "声部", "学校", "年级", "学员状态", "未排课时", "总课时", "已完成课时",
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学生姓名", "学员编号", "联系电话", "声部", "学校", "年级", "学员状态", "未排课时", "总课时", "已完成课时",
|
|
"剩余未开始课时","剩余课时(未开始+未排课资格)", "预收金额", "第一次课时间", "最近上课时间", "乐团主管编号", "乐团主管", "管理老师编号", "管理老师", "近30天课耗", "回访次数",
|
|
"剩余未开始课时","剩余课时(未开始+未排课资格)", "预收金额", "第一次课时间", "最近上课时间", "乐团主管编号", "乐团主管", "管理老师编号", "管理老师", "近30天课耗", "回访次数",
|
|
- "回访状态", "原因", "回访日期"},
|
|
|
|
|
|
+ "原因", "回访日期"},
|
|
new String[]{"studentBasicInfo.organName", "studentBasicInfo.userName", "studentBasicInfo.userId",
|
|
new String[]{"studentBasicInfo.organName", "studentBasicInfo.userName", "studentBasicInfo.userId",
|
|
"studentBasicInfo.phone", "studentBasicInfo.subjectName", "studentBasicInfo.cooperationOrganName", "studentBasicInfo.grade",
|
|
"studentBasicInfo.phone", "studentBasicInfo.subjectName", "studentBasicInfo.cooperationOrganName", "studentBasicInfo.grade",
|
|
- "studentBasicInfo.studentStatus",
|
|
|
|
|
|
+ "studentBasicInfo.studentStatus == null?'':studentBasicInfo.studentStatus == 'LOST' ? '流失':studentBasicInfo.studentStatus == 'NORMAL' ? " +
|
|
|
|
+ "'在读':studentBasicInfo.studentStatus == 'SLEEPY' ? '沉睡':studentBasicInfo.studentStatus == 'PAUSE' ? '暂停':'其他'",
|
|
"noScheduleNum", "totalCourseNum", "overCourseNum", "subCourseNum", "subTotalCourse", "preCourseFee", "firstCourseTime", "lastCourseTime","musicDirectorId", "musicDirectorName",
|
|
"noScheduleNum", "totalCourseNum", "overCourseNum", "subCourseNum", "subTotalCourse", "preCourseFee", "firstCourseTime", "lastCourseTime","musicDirectorId", "musicDirectorName",
|
|
"studentBasicInfo.subjectTeacherId", "studentBasicInfo.subjectTeacherName", "latelyCourseConsumer", "visitNum",
|
|
"studentBasicInfo.subjectTeacherId", "studentBasicInfo.subjectTeacherName", "latelyCourseConsumer", "visitNum",
|
|
- "lastVisitStatus == null?'':lastVisitStatus == 'LOST' ? '流失':lastVisitStatus == 'NORMAL' ? '在读':" +
|
|
|
|
- "lastVisitStatus == 'SLEEPY' ? '沉睡':lastVisitStatus == 'PAUSE' ? '暂停':'其他'"
|
|
|
|
- , "visitReason", "lastVisitTime"}, rows);
|
|
|
|
|
|
+ "visitReason", "lastVisitTime"}, rows);
|
|
exportManagerDownload(workbook, managerDownload);
|
|
exportManagerDownload(workbook, managerDownload);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|