فهرست منبع

add 需提交报告列表接口

周箭河 5 سال پیش
والد
کامیت
871a946ba8

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

@@ -344,7 +344,8 @@
         <foreach collection="classGroupIds" item="classGroupId" open="(" separator="," close=")">
             #{classGroupId}
         </foreach>
-        <![CDATA[AND class_date_ >= #{startDate} AND class_date_ <=#{endTime} ]]>
+        <![CDATA[AND class_date_ >= #{startDate} AND class_date_ <=#{endDate} ]]>
+        AND (del_flag_ =0 OR del_flag_ IS NULL)
         GROUP BY class_group_id_
     </select>
 </mapper>

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

@@ -45,8 +45,6 @@ public class StudyReportController extends BaseController {
         List<CourseScheduleEvaluate> courseScheduleEvaluates = courseScheduleEvaluateService.findByGroupId(groupId,null);
         String teacherBaseUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL);
         for (CourseScheduleEvaluate courseScheduleEvaluate : courseScheduleEvaluates) {
-            courseScheduleEvaluate.setTimes(2);
-            courseScheduleEvaluate.setTotalMinutes(100);
             courseScheduleEvaluate.setReportLink(teacherBaseUrl + "/#/studyReportNew?id=" + courseScheduleEvaluate.getId() + "&classGroupId=" + courseScheduleEvaluate.getClassGroupId());
             if (courseScheduleEvaluate.getStatus().equals(1) && courseScheduleEvaluate.getVersion().equals(2)) {
                 courseScheduleEvaluate.setReportLink(teacherBaseUrl + "/#/reportDetailNew?id=" + courseScheduleEvaluate.getId() + "&classGroupId=" + courseScheduleEvaluate.getClassGroupId());