add 需提交报告列表接口

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

@@ -1024,9 +1024,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             //剩余课程为显示陪练报告入口rul
             if(teacherClassGroupDto.getType() == ClassGroupTypeEnum.PRACTICE){
                 List<CourseScheduleEvaluate> courseScheduleEvaluates = courseScheduleEvaluateDao.findByClassGroupIds(classGroupIds);
-                Map<Integer, Long> reportMap = new HashMap<>();
-                if(courseScheduleEvaluates.size() >0 ) {
-                    reportMap = courseScheduleEvaluates.stream().collect(Collectors.toMap(CourseScheduleEvaluate::getClassGroupId, CourseScheduleEvaluate::getId));
+                Map<Integer, List<CourseScheduleEvaluate>> reportMap = new HashMap<>();
+                if(courseScheduleEvaluates.size()>0) {
+                    reportMap = courseScheduleEvaluates.stream().collect(Collectors.groupingBy(CourseScheduleEvaluate::getClassGroupId));
                 }
                 if(reportMap.containsKey(teacherClassGroupDto.getClassGroupId().intValue())){
                     teacherClassGroupDto.setHasReport(true);

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

@@ -88,7 +88,7 @@
         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}
+        WHERE cse.class_group_id_ = #{classGroupId} AND status_=1
         ORDER BY create_time_ DESC
         LIMIT 1
     </select>
@@ -98,6 +98,7 @@
         <foreach collection="classGroupIds" item="classGroupId" separator="," open="(" close=")">
             #{classGroupId}
         </foreach>
+        AND status_=1
     </select>
 
     <resultMap id="PracticeGroupsOrgan" type="com.ym.mec.biz.dal.dto.PracticeGroupsDto">
@@ -137,6 +138,7 @@
                  LEFT JOIN practice_group pg on cse.music_group_id_ = pg.id_
             AND pg.buy_months_ IS NULL
             AND pg.group_status_ != 'LOCK'
+            AND cse.status_ = 1
         GROUP BY pg.organ_id_
     </select>
 
@@ -165,12 +167,12 @@
     <select id="findExpiredDateBeforeReport" resultMap="CourseScheduleEvaluate">
         SELECT *
         FROM course_schedule_evaluate
-        WHERE create_time_ &lt;= #{expiredDate}
+        WHERE status_ = 1 AND create_time_ &lt;= #{expiredDate}
           AND (is_pushed_ = 0 OR is_pushed_ IS NULL)
     </select>
 
     <select id="findByGroupId" resultMap="CourseScheduleEvaluate">
-        SELECT id_, DATE_FORMAT(create_time_, '%Y年%m月') month_
+        SELECT id_,status_, DATE_FORMAT(create_time_, '%Y年%m月') month_
         FROM course_schedule_evaluate
         WHERE music_group_id_ = #{groupId}
         ORDER BY create_time_ ASC

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

@@ -38,24 +38,11 @@ public class StudyReportController extends BaseController {
     @GetMapping("getGroupReviews")
     public Object getGroupReviews(Integer groupId) {
         List<CourseScheduleEvaluate> courseScheduleEvaluates = courseScheduleEvaluateService.findByGroupId(groupId);
-        boolean hasReport = false;
-        Date nowDate = new Date();
         for (CourseScheduleEvaluate courseScheduleEvaluate : courseScheduleEvaluates) {
             courseScheduleEvaluate.setTimes(2);
             courseScheduleEvaluate.setTotalMinutes(100);
             courseScheduleEvaluate.setReportLink("http://www.baidu.com");
-            if (DateUtil.format(courseScheduleEvaluate.getCreateTime(), "yyyy-MM").equals(DateUtil.format(nowDate, "yyyy-MM"))) {
-                hasReport = true;
-            }
-        }
-        if (!hasReport) {
-            CourseScheduleEvaluate courseScheduleEvaluate = new CourseScheduleEvaluate();
-            courseScheduleEvaluate.setReportLink("http://www.baidu.com");
-            courseScheduleEvaluate.setTimes(2);
-            courseScheduleEvaluate.setTotalMinutes(100);
-            courseScheduleEvaluate.setMonth(DateUtil.format(nowDate, "yyyy年MM月"));
         }
-
         return succeed(courseScheduleEvaluates);
     }