Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -72,76 +72,78 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 查询分部所有老师
+     *
      * @param userIds
      * @return
      */
     List<TeacherBasicDto> findTeachers(@Param("userIds") List<Integer> userIds);
 
     /**
+     * @param userIds:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
      * @describe
      * @author Joburgess
      * @date 2020/2/10
-     * @param userIds:
-     * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
      */
     List<SimpleUserDto> findSimpleTeachers(@Param("userIds") List<Integer> userIds);
 
     /**
+     * @param organId:   分部编号
+     * @param subjectId: 声部编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      * @describe 获取指定声部和分部下的全职老师
      * @author Joburgess
      * @date 2020/2/2
-     * @param organId: 分部编号
-     * @param subjectId: 声部编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      */
     List<TeacherBasicDto> findTeaTeachersByOrganAndSubject(@Param("organId") Integer organId,
                                                            @Param("subjectId") Integer subjectId);
 
 
     /**
+     * @param organId:   分部编号
+     * @param subjectId: 声部编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      * @describe 获取指定声部和分部下的全职老师
      * @author Joburgess
      * @date 2020/2/2
-     * @param organId: 分部编号
-     * @param subjectId: 声部编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      */
     List<ExtendTeacherBasicDto> findTeaTeachersByOrganAndSubject1(@Param("organId") Integer organId,
                                                                   @Param("subjectId") Integer subjectId);
 
     /**
+     * @param organId:   分部编号
+     * @param subjectId: 声部编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      * @describe 获取指定声部和分部下的全职老师--付费
      * @author Joburgess
      * @date 2020/2/2
-     * @param organId: 分部编号
-     * @param subjectId: 声部编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      */
     List<ExtendTeacherBasicDto> findTeaTeachersByOrganAndSubject2(@Param("organId") Integer organId,
                                                                   @Param("subjectId") Integer subjectId);
 
     /**
+     * @param organIds:   部门编号列表
+     * @param subjectIds: 声部编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      * @describe 根据部门和声部获取教师列表
      * @author Joburgess
      * @date 2019/12/24
-     * @param organIds: 部门编号列表
-     * @param subjectIds: 声部编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      */
     List<TeacherBasicDto> findTeacherByOrganAndSubject(@Param("organIds") String organIds,
                                                        @Param("subjectIds") String subjectIds);
 
     /**
+     * @param teacherId:
+     * @return com.ym.mec.biz.dal.dto.TeacherBasicDto
      * @describe 获取教师
      * @author Joburgess
      * @date 2019/12/26
-     * @param teacherId:
-     * @return com.ym.mec.biz.dal.dto.TeacherBasicDto
      */
-    TeacherBasicDto findByTeacherId(@Param("teacherId")Integer teacherId);
+    TeacherBasicDto findByTeacherId(@Param("teacherId") Integer teacherId);
 
     /**
      * count上课结算列表
+     *
      * @param params
      * @return
      */
@@ -149,23 +151,25 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取教师上课结算列表
+     *
      * @param params
      * @return
      */
     List<TeacherCloseDto> queryCloses(Map<String, Object> params);
 
     /**
+     * @param musicGroupId: 乐团编号
+     * @return java.util.List<com.ym.mec.biz.dal.dto.BasicUserDto>
      * @describe 获取指定乐团下的所有老师
      * @author Joburgess
      * @date 2019/10/19
-     * @param musicGroupId: 乐团编号
-     * @return java.util.List<com.ym.mec.biz.dal.dto.BasicUserDto>
      */
     List<BasicUserDto> findTeacherByMusicGroup(String musicGroupId);
 
 
     /**
      * 获取教师未结算课酬综合
+     *
      * @param teacherId
      * @return
      */
@@ -173,6 +177,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取乐团详情老师列表
+     *
      * @param params
      * @return
      */
@@ -180,6 +185,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * Count乐团详情老师列表
+     *
      * @param params
      * @return
      */
@@ -187,13 +193,15 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 根据教师编号列表，和班级编号列表获取教师签到次数
+     *
      * @param teacherIdStr
      * @return
      */
-    List<Map<Integer, Integer>> findSignNum(@Param("teacherIdStr") String teacherIdStr,@Param("musicGroupId") String musicGroupId);
+    List<Map<Integer, Integer>> findSignNum(@Param("teacherIdStr") String teacherIdStr, @Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取教师乐团上课记录（乐团管理--乐团详情）
+     *
      * @param params
      * @return
      */
@@ -201,6 +209,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * COUNT教师乐团上课记录（乐团管理--乐团详情）
+     *
      * @param params
      * @return
      */
@@ -208,6 +217,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取乐团学员报名列表
+     *
      * @param params
      * @return
      */
@@ -215,6 +225,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * COUNT乐团学员报名列表
+     *
      * @param params
      * @return
      */
@@ -222,65 +233,70 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取老师的群组基本信息
+     *
      * @param teacherIds
      * @param search
      * @return
      */
-    List<BasicUserDto> queryMusicGroupStudents(@Param("teacherIds") String teacherIds,@Param("search") String search);
+    List<BasicUserDto> queryMusicGroupStudents(@Param("teacherIds") String teacherIds, @Param("search") String search);
 
     /**
+     * @param subjectId: 声部编号
+     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      * @describe 根据声部获取部门下的老师
      * @author Joburgess
      * @date 2019/11/4
-     * @param subjectId: 声部编号
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
     List<Teacher> findOrganTeacherBySubject(@Param("subjectId") Integer subjectId);
 
     /**
      * 根据分部查询老师数
+     *
      * @param organId
      * @return
      */
-    Map<String,Integer> queryOrganTeacherNum(@Param("organId") String organId);
+    Map<String, Integer> queryOrganTeacherNum(@Param("organId") String organId);
 
     List<Teacher> findByFlowOrganRange(Map<String, Object> params);
 
     /**
+     * @param teacherIds: 教师编号里列表
+     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      * @describe 根据教师编号获取教师信息
      * @author Joburgess
      * @date 2019/12/10
-     * @param teacherIds: 教师编号里列表
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
     List<Teacher> findByTeacherIds(@Param("teacherIds") List<Integer> teacherIds);
 
     /**
      * 获取分部下的老师列表
+     *
      * @param organId
      * @param subjectIds
      * @return
      */
-    List<Teacher> findTeacherByOrganId(@Param("organId")String organId,@Param("subjectIds")String subjectIds,@Param("jobNature")String jobNature);
+    List<Teacher> findTeacherByOrganId(@Param("organId") String organId, @Param("subjectIds") String subjectIds, @Param("jobNature") String jobNature);
 
     /**
      * 获取用户username
+     *
      * @param userIds
      * @return
      */
     List<Map<Integer, String>> queryUsernameByIds(@Param("userIds") List<Integer> userIds);
 
     /**
+     * @param params: 搜索参数
+     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      * @describe 教师搜索
      * @author Joburgess
      * @date 2020/1/7
-     * @param params: 搜索参数
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
     List<TeacherBasicDto> searchTeachers(Map<String, Object> params);
 
     /**
      * 获取教师列表
+     *
      * @param params
      * @return
      */
@@ -290,6 +306,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取教师布置的作业
+     *
      * @param courseScheduleId
      * @return
      */
@@ -299,6 +316,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取user
+     *
      * @param userId
      * @return
      */
@@ -306,13 +324,15 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取教师基本信息
+     *
      * @param teacherId
      * @return
      */
-    List<BasicUserDto> queryTeacherBaseInfo(@Param("teacherId")Set<Integer> teacherId);
+    List<BasicUserDto> queryTeacherBaseInfo(@Param("teacherId") Set<Integer> teacherId);
 
     /**
      * 获取教师immodel
+     *
      * @param teacherIds
      * @return
      */
@@ -320,6 +340,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取和学员相关的乐团老师列表
+     *
      * @param studentId
      * @return
      */
@@ -327,6 +348,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取和学员相关的VIP老师列表
+     *
      * @param studentId
      * @return
      */
@@ -334,8 +356,16 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取和学员相关的陪练课老师列表
+     *
      * @param studentId
      * @return
      */
     Set<Integer> findPracticeTeacherIds(Integer studentId);
+
+    /**
+     * 获取教师基本信息
+     * @param id
+     * @return
+     */
+    BasicUserDto findTeacherInfo(Integer id);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleEvaluate.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -24,6 +26,17 @@ public class CourseScheduleEvaluate {
 
     private Date createTime;
 
+    private Integer studentId;
+
+    @ApiModelProperty(value = "学生专业")
+    private String subjectName;
+
+    @ApiModelProperty(value = "学生信息")
+    private SysUser student;
+
+    @ApiModelProperty(value = "老师信息")
+    private BasicUserDto teacher;
+
     public Long getId() {
         return id;
     }
@@ -87,4 +100,36 @@ public class CourseScheduleEvaluate {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public BasicUserDto getTeacher() {
+        return teacher;
+    }
+
+    public void setTeacher(BasicUserDto teacher) {
+        this.teacher = teacher;
+    }
+
+    public SysUser getStudent() {
+        return student;
+    }
+
+    public void setStudent(SysUser student) {
+        this.student = student;
+    }
 }

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

@@ -11,4 +11,6 @@ public interface CourseScheduleEvaluateService extends BaseService<Long, CourseS
 
     boolean addStudyReport(CourseScheduleEvaluate courseScheduleEvaluate);
 
+    CourseScheduleEvaluate getStudyReport(Integer classGroupId);
+
 }

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

@@ -1,8 +1,11 @@
 package com.ym.mec.biz.service.impl;
 
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.CourseScheduleEvaluateDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.CourseScheduleEvaluate;
 import com.ym.mec.biz.service.CourseScheduleEvaluateService;
@@ -13,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
 
 @Service
 public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, CourseScheduleEvaluate> implements CourseScheduleEvaluateService {
@@ -21,6 +26,8 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
     private CourseScheduleEvaluateDao courseScheduleEvaluateDao;
     @Autowired
     private ClassGroupDao classGroupDao;
+    @Autowired
+    private TeacherDao teacherDao;
 
     @Override
     public BaseDAO<Long, CourseScheduleEvaluate> getDAO() {
@@ -31,19 +38,34 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
     @Override
     public boolean addStudyReport(CourseScheduleEvaluate courseScheduleEvaluate) {
         ClassGroup classGroup = classGroupDao.get(courseScheduleEvaluate.getClassGroupId());
-        if(classGroup==null){
-           throw new BizException("课程不存在！");
+        if (classGroup == null) {
+            throw new BizException("课程不存在！");
         }
         CourseScheduleEvaluate hasOne = courseScheduleEvaluateDao.findByClassGroupId(courseScheduleEvaluate.getClassGroupId());
-        if(hasOne != null){
+        if (hasOne != null) {
             throw new BizException("报告已添加，请勿重复提交");
         }
         courseScheduleEvaluate.setMusicGroupId(classGroup.getMusicGroupId());
         courseScheduleEvaluate.setCreateTime(new Date());
         long num = courseScheduleEvaluateDao.insert(courseScheduleEvaluate);
-        if(num <= 0){
+        if (num <= 0) {
             throw new BizException("报告添加失败，请重试");
         }
         return true;
     }
+
+    @Override
+    public CourseScheduleEvaluate getStudyReport(Integer classGroupId) {
+        CourseScheduleEvaluate studyReport = courseScheduleEvaluateDao.findByClassGroupId(classGroupId);
+        if (studyReport == null) {
+            throw new BizException("报告不存在");
+        }
+        SysUser user = teacherDao.getUser(studyReport.getStudentId());
+        BasicUserDto teacherInfo = teacherDao.findTeacherInfo(studyReport.getTeacherId());
+
+        studyReport.setStudent(user);
+        studyReport.setTeacher(teacherInfo);
+        return studyReport;
+
+    }
 }

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

@@ -10,6 +10,8 @@
         <result column="item_" jdbcType="VARCHAR" property="item" />
         <result column="comment_" jdbcType="LONGVARCHAR" property="comment" />
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="student_id_" jdbcType="INTEGER" property="studentId"  />
+        <result column="subject_name_" jdbcType="VARCHAR" property="subjectName"  />
     </resultMap>
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleEvaluate" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
@@ -22,6 +24,9 @@
     </insert>
 
     <select id="findByClassGroupId" resultMap="CourseScheduleEvaluate">
-        SELECT * FROM course_schedule_evaluate WHERE class_group_id_ = #{classGroupId}
+        SELECT cse.*,s.name_ subject_name_,pg.student_id_ FROM course_schedule_evaluate cse
+        LEFT JOIN practice_group pg ON pg.id_ = cse.music_group_id_
+        LEFT JOIN subject s on s.id_ = pg.subject_id_
+        WHERE cse.class_group_id_ = #{classGroupId}
     </select>
 </mapper>

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

@@ -824,4 +824,17 @@
         LEFT JOIN practice_group pg ON pg.id_ = cgsm.music_group_id_
         WHERE cgsm.group_type_ = 'PRACTICE' AND cgsm.user_id_ = #{studentId}
     </select>
+
+    <select id="findTeacherInfo"  resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT
+        su.real_name_ username_,
+        su.id_ user_id_,
+        su.avatar_ head_url_,
+        gender_,
+        GROUP_CONCAT(s.name_) subject_name_
+        FROM sys_user su
+        LEFT JOIN teacher t ON su.id_ = t.id_
+        LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
+        WHERE su.id_ = #{id}
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudyReportController.java

@@ -0,0 +1,26 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.service.CourseScheduleEvaluateService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("studyReport")
+@Api(tags = "陪练报告")
+@RestController
+public class StudyReportController extends BaseController {
+
+	@Autowired
+	private CourseScheduleEvaluateService courseScheduleEvaluateService;
+
+
+	@ApiOperation("获取学生陪练报告信息")
+	@GetMapping(value = "info")
+	public Object info(Integer classGroupId) {
+		return succeed(courseScheduleEvaluateService.getStudyReport(classGroupId));
+	}
+}

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

@@ -21,7 +21,7 @@ import java.util.List;
 
 
 @RequestMapping("teacherCourseStatistics")
-@Api(tags = "教师服务")
+@Api(tags = "教师排课统计服务")
 @RestController
 public class TeacherCourseStatisticsController extends BaseController {