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

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

@@ -12,4 +12,6 @@ import java.util.List;
 public interface CourseScheduleEvaluateDao extends BaseDAO<Long, CourseScheduleEvaluate> {
 
     CourseScheduleEvaluate findByClassGroupId(@Param("classGroupId") Integer classGroupId);
+
+    List<CourseScheduleEvaluate> findByClassGroupIds(@Param("classGroupIds") List<Integer> classGroupIds);
 }

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

@@ -83,6 +83,9 @@ public class TeacherClassGroupDto {
     @ApiModelProperty(value = "陪练报告URL")
     private String studyReportUrl;
 
+    @ApiModelProperty(value = "是否已有报告")
+    private Boolean hasReport;
+
     public Date getCourseStartDate() {
         return courseStartDate;
     }
@@ -274,4 +277,12 @@ public class TeacherClassGroupDto {
     public void setStudyReportUrl(String studyReportUrl) {
         this.studyReportUrl = studyReportUrl;
     }
+
+    public Boolean getHasReport() {
+        return hasReport;
+    }
+
+    public void setHasReport(Boolean hasReport) {
+        this.hasReport = hasReport;
+    }
 }

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

@@ -158,7 +158,7 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String TEACHER_STUDY_REPORT_URL = "teacher_study_report_url";
 
     /**
-     * 陪练课学生地址
+     * 陪练课报告地址
      */
     String STUDENT_STUDY_REPORT_URL = "student_study_report_url";
 

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

@@ -106,6 +106,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     private SubjectDao subjectDao;
     @Autowired
     private GroupDao groupDao;
+    @Autowired
+    private CourseScheduleEvaluateDao courseScheduleEvaluateDao;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -975,7 +977,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             //剩余课程为显示陪练报告入口rul
             if(teacherClassGroupDto.getType() == ClassGroupTypeEnum.PRACTICE){
-               if(classGroupNoStartClassTimes.intValue()==0 && classGroupTeacherMap.get(teacherClassGroupDto.getClassGroupId().intValue()).equals(user.getId())){
+                List<CourseScheduleEvaluate> courseScheduleEvaluates = courseScheduleEvaluateDao.findByClassGroupIds(classGroupIds);
+                Map<Integer, Long> reportMap = courseScheduleEvaluates.stream().collect(Collectors.toMap(CourseScheduleEvaluate::getClassGroupId, CourseScheduleEvaluate::getId));
+                if(reportMap.containsKey(teacherClassGroupDto.getClassGroupId().intValue())){
+                    teacherClassGroupDto.setHasReport(true);
+                    String studyReportUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_STUDY_REPORT_URL);
+                    teacherClassGroupDto.setStudyReportUrl(studyReportUrl+teacherClassGroupDto.getClassGroupId());
+                }else if(classGroupNoStartClassTimes.intValue()==0 && classGroupTeacherMap.get(teacherClassGroupDto.getClassGroupId().intValue()).equals(user.getId())){
                    String studyReportUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_STUDY_REPORT_URL);
                    teacherClassGroupDto.setStudyReportUrl(studyReportUrl+teacherClassGroupDto.getClassGroupId());
                }

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

@@ -2,31 +2,39 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ym.mec.biz.dal.dao.CourseScheduleEvaluateDao">
     <resultMap id="CourseScheduleEvaluate" type="com.ym.mec.biz.dal.entity.CourseScheduleEvaluate">
-        <id column="id_" jdbcType="BIGINT" property="id" />
-        <result column="music_group_id_" jdbcType="VARCHAR" property="musicGroupId" />
-        <result column="class_group_id_" jdbcType="INTEGER" property="classGroupId" />
-        <result column="course_schedule_id_" jdbcType="BIGINT" property="courseScheduleId" />
-        <result column="teacher_id_" jdbcType="INTEGER" property="teacherId" />
-        <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"  />
+        <id column="id_" jdbcType="BIGINT" property="id"/>
+        <result column="music_group_id_" jdbcType="VARCHAR" property="musicGroupId"/>
+        <result column="class_group_id_" jdbcType="INTEGER" property="classGroupId"/>
+        <result column="course_schedule_id_" jdbcType="BIGINT" property="courseScheduleId"/>
+        <result column="teacher_id_" jdbcType="INTEGER" property="teacherId"/>
+        <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">
         insert into course_schedule_evaluate (music_group_id_, class_group_id_, course_schedule_id_,
-        teacher_id_, item_, comment_,
-        create_time_)
+                                              teacher_id_, item_, comment_,
+                                              create_time_)
         values (#{musicGroupId,jdbcType=VARCHAR}, #{classGroupId,jdbcType=INTEGER}, #{courseScheduleId,jdbcType=BIGINT},
-        #{teacherId,jdbcType=INTEGER}, #{item,jdbcType=VARCHAR}, #{comment,jdbcType=LONGVARCHAR},
-        #{createTime,jdbcType=TIMESTAMP})
+                #{teacherId,jdbcType=INTEGER}, #{item,jdbcType=VARCHAR}, #{comment,jdbcType=LONGVARCHAR},
+                #{createTime,jdbcType=TIMESTAMP})
     </insert>
 
     <select id="findByClassGroupId" resultMap="CourseScheduleEvaluate">
-        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_
+        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>
+
+    <select id="findByClassGroupIds" resultMap="CourseScheduleEvaluate">
+        SELECT * FROM course_schedule_evaluate WHERE class_group_id_ IN
+        <foreach collection="classGroupIds" item="classGroupId" separator="," open="(" close=")">
+            #{classGroupId}
+        </foreach>
+    </select>
 </mapper>