Merge remote-tracking branch 'origin/master'

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

@@ -12,6 +12,8 @@ public class CourseGroupExportDto {
     private Integer teacherId;
     private String teacherIds;
     private String teacherName;
+    private String eduTeacherIds;
+    private String eduTeacherName;
     private Date expireDate;
     private Date classStartDate;
     private Date classEndDate;
@@ -115,4 +117,20 @@ public class CourseGroupExportDto {
     public void setTeacherIds(String teacherIds) {
         this.teacherIds = teacherIds;
     }
+
+    public String getEduTeacherIds() {
+        return eduTeacherIds;
+    }
+
+    public void setEduTeacherIds(String eduTeacherIds) {
+        this.eduTeacherIds = eduTeacherIds;
+    }
+
+    public String getEduTeacherName() {
+        return eduTeacherName;
+    }
+
+    public void setEduTeacherName(String eduTeacherName) {
+        this.eduTeacherName = eduTeacherName;
+    }
 }

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

@@ -3023,11 +3023,14 @@
     <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_
+        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_`
         WHERE cssp.`group_type_` = 'VIP'
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(vg.organ_id_, #{organIds})

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

@@ -504,6 +504,8 @@
         <result column="teacher_id_" property="teacherId"/>
         <result column="teacher_ids_" property="teacherIds"/>
         <result column="teacher_name_" property="teacherName"/>
+        <result column="edu_teacher_ids_" property="eduTeacherIds"/>
+        <result column="edu_teacher_name_" property="eduTeacherName"/>
         <result column="expire_date_" property="expireDate"/>
         <result column="class_start_date_" property="classStartDate"/>
         <result column="class_end_date_" property="classEndDate"/>
@@ -516,10 +518,13 @@
         su.username_ student_name_,
         o.name_ organ_name_,
         MAX(pg.courses_expire_date_) expire_date_,
-        CASE WHEN MAX(pg.buy_months_) IS NULL THEN 0 ELSE 1 END buy_practice_
+        CASE WHEN MAX(pg.buy_months_) IS NULL THEN 0 ELSE 1 END buy_practice_,
+        GROUP_CONCAT(DISTINCT edut.`real_name_`) edu_teacher_name_,
+        GROUP_CONCAT(DISTINCT edut.`id_`) edu_teacher_ids_
         FROM practice_group pg
         LEFT JOIN organization o on o.id_ = pg.organ_id_
         LEFT JOIN sys_user su ON su.id_ = pg.student_id_
+        left join sys_user edut ON edut.id_ = pg.educational_teacher_id_
         WHERE pg.group_status_ IN ('NORMAL','FINISH')
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(pg.organ_id_, #{organIds})

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

@@ -1131,8 +1131,8 @@ public class ExportController extends BaseController {
         }
 
         try {
-            String[] header = {"分部", "学生编号", "学生姓名", "网管课老师id", "网管课老师", "有效期截止时间", "课程截止时间", "总课时", "剩余课时", "是否购买"};
-            String[] body = {"organName", "studentId", "studentName", "teacherIds", "teacherName", "expireDate", "classEndDate", "totalClassTimes", "noStartClassTimes", "buyPractice.msg"};
+            String[] header = {"分部", "学生编号", "学生姓名", "网管课老师id", "网管课老师", "教务老师id", "教务老师", "有效期截止时间", "课程截止时间", "总课时", "剩余课时", "是否购买"};
+            String[] body = {"organName", "studentId", "studentName", "teacherIds", "teacherName", "eduTeacherIds", "eduTeacherName", "expireDate", "classEndDate", "totalClassTimes", "noStartClassTimes", "buyPractice.msg"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupExports);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
@@ -1203,8 +1203,8 @@ public class ExportController extends BaseController {
         }
 
         try {
-            String[] header = {"分部", "学生编号", "学生姓名", "指导老师id", "指导老师", "课程开始时间", "课程截止时间", "总课时", "剩余课时"};
-            String[] body = {"organName", "studentId", "studentName", "teacherIds", "teacherName", "classStartDate", "classEndDate", "totalClassTimes", "noStartClassTimes"};
+            String[] header = {"分部", "学生编号", "学生姓名", "指导老师id", "指导老师", "教务老师id", "教务老师", "课程开始时间", "课程截止时间", "总课时", "剩余课时"};
+            String[] body = {"organName", "studentId", "studentName", "teacherIds", "teacherName", "eduTeacherIds", "eduTeacherName", "classStartDate", "classEndDate", "totalClassTimes", "noStartClassTimes"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, vipGroupExports);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
@@ -1711,7 +1711,7 @@ public class ExportController extends BaseController {
         musicGroupStatusList.add(MusicGroupStatusEnum.APPLY);
         musicGroupStatusList.add(MusicGroupStatusEnum.PAY);
 
-        List<MusicGroupRegisterDto> musicGroupRegisters = musicGroupDao.getMusicGroupRegister(musicGroupStatusList,organIds);
+        List<MusicGroupRegisterDto> musicGroupRegisters = musicGroupDao.getMusicGroupRegister(musicGroupStatusList, organIds);
 
         if (musicGroupRegisters.size() <= 0) {
             response.setStatus(200);
@@ -1722,7 +1722,7 @@ public class ExportController extends BaseController {
         }
         List<String> musicGroupIds = musicGroupRegisters.stream().map(MusicGroupRegisterDto::getMusicGroupId).collect(Collectors.toList());
 
-        List<RegisterSubjectDto> registerSubjects = musicGroupDao.getRegisterSubjectNum(musicGroupIds,null,2);
+        List<RegisterSubjectDto> registerSubjects = musicGroupDao.getRegisterSubjectNum(musicGroupIds, null, 2);
         List<MusicGroupRegisterDto> musicGroupRegisterOrders = musicGroupDao.getMusicGroupRegisterOrder(musicGroupIds);
         List<MusicGroupRegisterDto> musicGroupRegisterTotalMoneys = musicGroupDao.getMusicGroupRegisterTotalMoney(musicGroupIds);
 
@@ -2047,7 +2047,7 @@ public class ExportController extends BaseController {
         musicGroupStatusList.add(MusicGroupStatusEnum.PREPARE);
         musicGroupStatusList.add(MusicGroupStatusEnum.PROGRESS);
         musicGroupStatusList.add(MusicGroupStatusEnum.PAUSE);
-        List<MusicGroupRegisterDto> musicGroupRegisters = musicGroupDao.getMusicGroupRegister(musicGroupStatusList,organIds);
+        List<MusicGroupRegisterDto> musicGroupRegisters = musicGroupDao.getMusicGroupRegister(musicGroupStatusList, organIds);
 
         if (musicGroupRegisters.size() <= 0) {
             response.setStatus(200);
@@ -2058,7 +2058,7 @@ public class ExportController extends BaseController {
         }
         List<String> musicGroupIds = musicGroupRegisters.stream().map(MusicGroupRegisterDto::getMusicGroupId).collect(Collectors.toList());
 
-        List<RegisterSubjectDto> registerSubjects = musicGroupDao.getRegisterSubjectNum(musicGroupIds,StudentMusicGroupStatusEnum.NORMAL,null);
+        List<RegisterSubjectDto> registerSubjects = musicGroupDao.getRegisterSubjectNum(musicGroupIds, StudentMusicGroupStatusEnum.NORMAL, null);
 
         HashSet<Integer> added = new HashSet<>();
         List<String> header = new ArrayList<>();
@@ -2129,7 +2129,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "回款统计")
     @RequestMapping("export/studentOrder")
     @PreAuthorize("@pcs.hasPermissions('export/studentOrder')")
-    public void studentOrder(String organIds,Date date, HttpServletResponse response) throws IOException {
+    public void studentOrder(String organIds, Date date, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
@@ -2140,12 +2140,12 @@ public class ExportController extends BaseController {
         Date startTime = DateUtil.getFirstDayOfMonth(date);
         Date EndTime = DateUtil.getLastSecondWithDay(DateUtil.getLastDayOfMonth(date));
 
-        List<OrderTypeEnum> orderTypeList = new  ArrayList<>();
+        List<OrderTypeEnum> orderTypeList = new ArrayList<>();
         orderTypeList.add(OrderTypeEnum.SPORADIC);
         orderTypeList.add(OrderTypeEnum.PRACTICE_GROUP_BUY);
         orderTypeList.add(OrderTypeEnum.PRACTICE_GROUP_RENEW);
         orderTypeList.add(OrderTypeEnum.SMALL_CLASS_TO_BUY);
-        List<OrderByTypeExportDto> orders = studentPaymentOrderDao.getOrderByMonthAndType(organIds, orderTypeList,startTime,EndTime);
+        List<OrderByTypeExportDto> orders = studentPaymentOrderDao.getOrderByMonthAndType(organIds, orderTypeList, startTime, EndTime);
 
         if (orders.size() <= 0) {
             response.setStatus(200);
@@ -2159,23 +2159,23 @@ public class ExportController extends BaseController {
 
         List<VipBuyResultDto> vipGroupTeachers = new ArrayList<>();
         List<PracticeCourseDto> practiceGroupsTeacher = new ArrayList<>();
-        if(vipGroupIds.size() > 0){
+        if (vipGroupIds.size() > 0) {
             vipGroupTeachers = vipGroupDao.getGroupTeachers(vipGroupIds);
         }
 
-        if(practiceGroupIds.size() >0){
+        if (practiceGroupIds.size() > 0) {
             practiceGroupsTeacher = practiceGroupDao.getPracticeGroupByIds(practiceGroupIds);
         }
 
         for (OrderByTypeExportDto order : orders) {
             for (VipBuyResultDto vipGroupTeacher : vipGroupTeachers) {
-                if(order.getGroupType().equals(GroupType.VIP) && order.getMusicGroupId().equals(vipGroupTeacher.getVipGroupId().longValue())){
+                if (order.getGroupType().equals(GroupType.VIP) && order.getMusicGroupId().equals(vipGroupTeacher.getVipGroupId().longValue())) {
                     order.setTeacherName(vipGroupTeacher.getTeacherName());
                     order.setEduTeacherName(vipGroupTeacher.getEduTeacherName());
                 }
             }
             for (PracticeCourseDto practiceCourseDto : practiceGroupsTeacher) {
-                if(order.getGroupType().equals(GroupType.PRACTICE) && order.getMusicGroupId().equals(practiceCourseDto.getId())){
+                if (order.getGroupType().equals(GroupType.PRACTICE) && order.getMusicGroupId().equals(practiceCourseDto.getId())) {
                     order.setTeacherName(practiceCourseDto.getTeacherName());
                     order.setEduTeacherName(practiceCourseDto.getEduTeacherName());
                 }