|
|
@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.admin.exam;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
@@ -31,6 +32,7 @@ import cn.com.qmth.stmms.biz.school.model.School;
|
|
|
import cn.com.qmth.stmms.biz.school.service.SchoolService;
|
|
|
import cn.com.qmth.stmms.common.annotation.Logging;
|
|
|
import cn.com.qmth.stmms.common.annotation.RoleRequire;
|
|
|
+import cn.com.qmth.stmms.common.enums.ExamStatus;
|
|
|
import cn.com.qmth.stmms.common.enums.LogType;
|
|
|
import cn.com.qmth.stmms.common.enums.Role;
|
|
|
import cn.com.qmth.stmms.common.utils.ExportExcel;
|
|
|
@@ -135,7 +137,12 @@ public class SubjectController extends BaseExamController {
|
|
|
model.addAttribute("schoolId", schoolId);
|
|
|
model.addAttribute("schoolName", s.getName());
|
|
|
List<Exam> examList = examService.findBySchoolId(schoolId);
|
|
|
- model.addAttribute("examList", examList);
|
|
|
+ if(examList!=null&&examList.size()>0) {
|
|
|
+ List<Exam> tem=examList.stream().filter(e->!ExamStatus.FINISH.equals(e.getStatus())).collect(Collectors.toList());
|
|
|
+ model.addAttribute("examList", tem);
|
|
|
+ }else {
|
|
|
+ model.addAttribute("examList", examList);
|
|
|
+ }
|
|
|
return "modules/exam/subjectSplit";
|
|
|
}
|
|
|
|
