课程转换

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseConvertLogDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.CourseConvertDetailDto;
 import com.ym.mec.biz.dal.dto.CourseConvertLogDto;
 import com.ym.mec.biz.dal.entity.CourseConvertLog;
 import com.ym.mec.common.dal.BaseDAO;
@@ -14,4 +15,6 @@ public interface CourseConvertLogDao extends BaseDAO<Integer, CourseConvertLog>
     int countConvertPage(Map<String, Object> params);
 
     List<CourseConvertLogDto> queryConvertPage(Map<String, Object> params);
+
+    List<CourseConvertDetailDto> queryCourse(Integer courseConvertId);
 }

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

@@ -0,0 +1,73 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+public class CourseConvertDetailDto {
+
+    @ApiModelProperty(value = "课程编号")
+    private Long courseId;
+
+    @ApiModelProperty(value = "班级名称")
+    private String className;
+
+    @ApiModelProperty(value = "课程名称")
+    private String courseName;
+
+    @ApiModelProperty(value = "声部名称")
+    private String subjectName;
+
+    @ApiModelProperty(value = "老师名称")
+    private String teacherName;
+
+    @ApiModelProperty(value = "课程状态")
+    private CourseStatusEnum status;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public CourseStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(CourseStatusEnum status) {
+        this.status = status;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/CourseConvertLogService.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dao.CourseConvertLogDao;
+import com.ym.mec.biz.dal.dto.CourseConvertDetailDto;
 import com.ym.mec.biz.dal.dto.CourseConvertLogDto;
 import com.ym.mec.biz.dal.entity.CourseConvertLog;
 import com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment;
@@ -19,4 +20,6 @@ public interface CourseConvertLogService extends  BaseService<Integer, CourseCon
               List<CourseScheduleStudentPayment> studentPayments);
 
     PageInfo<CourseConvertLogDto> queryConvertPage(ConvertLogQueryInfo queryInfo);
+
+    List<CourseConvertDetailDto> queryCourse(Integer courseConvertId);
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dto.CourseConvertDetailDto;
 import com.ym.mec.biz.dal.dto.CourseConvertLogDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.ConvertLogQueryInfo;
@@ -119,4 +120,9 @@ public class CourseConvertLogServiceImpl extends BaseServiceImpl<Integer, Course
 		pageInfo.setRows(dataList);
 		return pageInfo;
 	}
+
+    @Override
+    public List<CourseConvertDetailDto> queryCourse(Integer courseConvertId) {
+        return courseConvertLogDao.queryCourse(courseConvertId);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.ym.mec.biz.dal.dao.CourseScheduleConvertDao;
 import com.ym.mec.biz.dal.dao.StudentDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.CourseConvertSumDto;
 import com.ym.mec.biz.dal.entity.*;
@@ -51,6 +52,8 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
     private TeacherAttendanceService teacherAttendanceService;
     @Autowired
     private CloudTeacherFreeCourseService cloudTeacherFreeCourseService;
+    @Autowired
+    private TeacherDao teacherDao;
 
     @Override
     public HashMap<String, Object> queryConvertStudent(String courseIds) {
@@ -119,6 +122,10 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
                     courseScheduleTeacherSalaryList.addAll(groupDto.getCourseScheduleTeacherSalaryList());
                     courseScheduleStudentPayments.addAll(groupDto.getCourseScheduleStudentPayments());
                 }else {
+                    List<CourseSchedule> schedules = result.getData();
+                    List<Integer> teacherIdList = schedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toList());
+                    Map<Integer, String> maps = MapUtil.convertIntegerMap(teacherDao.queryNameByIdList(teacherIdList));
+                    for (CourseSchedule e : schedules) {e.setActualTeacherName(maps.get(e.getActualTeacherId()));}
                     return result;
                 }
             }

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

@@ -74,4 +74,21 @@
 		SELECT COUNT(ccl.id_) FROM course_convert_log ccl
 		<include refid="queryPageSql"/>
 	</select>
+	<resultMap id="CourseConvertDetailDto" type="com.ym.mec.biz.dal.dto.CourseConvertDetailDto">
+		<result property="courseId" column="courseId"/>
+		<result property="className" column="className"/>
+		<result property="courseName" column="courseName"/>
+		<result property="teacherName" column="teacherName"/>
+		<result property="subjectName" column="subjectName"/>
+		<result property="status" column="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+	</resultMap>
+	<select id="queryCourse" resultMap="CourseConvertDetailDto">
+		select cs.id_ courseId,cg.name_ className,cs.name_ courseName,su.real_name_ teacherName,cs.status_ status,
+		       GROUP_CONCAT(distinct sb.name_) subjectName from course_convert_log ccl
+		left join course_schedule cs ON FIND_IN_SET(cs.id_,ccl.new_course_ids_)
+		left join class_group cg ON FIND_IN_SET(cg.id_,ccl.new_class_ids_)
+		left join sys_user su ON su.id_ = cs.actual_teacher_id_
+		left join subject sb ON FIND_IN_SET(sb.id_,cg.subject_id_list_)
+		group by cs.id_
+	</select>
 </mapper>

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

@@ -1,9 +1,8 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.dao.CourseConvertLogDao;
+import com.ym.mec.biz.dal.dto.CourseConvertDetailDto;
 import com.ym.mec.biz.dal.dto.CourseConvertLogDto;
 import com.ym.mec.biz.dal.entity.ClassGroupDto;
-import com.ym.mec.biz.dal.entity.CourseConvertLog;
 import com.ym.mec.biz.dal.page.ConvertLogQueryInfo;
 import com.ym.mec.biz.service.CourseConvertLogService;
 import com.ym.mec.biz.service.CourseScheduleConvertService;
@@ -42,6 +41,13 @@ public class CourseScheduleConvertController extends BaseController {
         return succeed(courseConvertLogService.queryConvertPage(queryInfo));
     }
 
+    @ApiOperation(value = "获取转换后的课程列表")
+    @GetMapping("/queryCourse")
+    @PreAuthorize("@pcs.hasPermissions('courseScheduleConvert/queryCourse')")
+    public HttpResponseResult<List<CourseConvertDetailDto>> queryCourse(Integer courseConvertId){
+        return succeed(courseConvertLogService.queryCourse(courseConvertId));
+    }
+
     @ApiOperation(value = "获取需要转换的学员列表")
     @GetMapping("/queryStudent")
     @PreAuthorize("@pcs.hasPermissions('courseScheduleConvert/queryStudent')")