|
@@ -20,11 +20,13 @@ import cn.com.qmth.stmms.common.annotation.RoleRequire;
|
|
|
import cn.com.qmth.stmms.common.domain.WebUser;
|
|
|
import cn.com.qmth.stmms.common.enums.LockType;
|
|
|
import cn.com.qmth.stmms.common.enums.LogType;
|
|
|
+import cn.com.qmth.stmms.common.enums.MarkStatus;
|
|
|
import cn.com.qmth.stmms.common.enums.Role;
|
|
|
import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
|
|
|
import cn.com.qmth.stmms.common.utils.RequestUtils;
|
|
|
import net.sf.json.JSONArray;
|
|
|
import net.sf.json.JSONObject;
|
|
|
+
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -39,6 +41,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|
|
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+
|
|
|
import java.util.*;
|
|
|
|
|
|
@Controller("inspectedController")
|
|
@@ -107,7 +110,8 @@ public class InspectedController extends BaseExamController {
|
|
|
if (query.getStudentIds() == null || query.getStudentIds().size() != 0) {
|
|
|
query = studentService.findByQuery(query);
|
|
|
}
|
|
|
- List<MarkGroup> groupList = groupService.findByExamAndSubject(examId, query.getSubjectCode());
|
|
|
+ List<MarkGroup> groupList = groupService.findByExamAndSubjectAndStatus(examId, query.getSubjectCode(),
|
|
|
+ MarkStatus.FORMAL);
|
|
|
for (MarkGroup group : groupList) {
|
|
|
group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
|
|
|
group.getSubjectCode(), false, group.getNumber()));
|