|
@@ -90,9 +90,8 @@ public class InspectedController extends BaseExamController {
|
|
@RequestMapping
|
|
@RequestMapping
|
|
public String list(Model model, HttpServletRequest request, ExamStudentSearchQuery query,
|
|
public String list(Model model, HttpServletRequest request, ExamStudentSearchQuery query,
|
|
@RequestParam(required = false) SubjectiveStatus status,
|
|
@RequestParam(required = false) SubjectiveStatus status,
|
|
- @RequestParam(required = false) Integer groupNumber,
|
|
|
|
- @RequestParam(required = false) Double groupStartScore,
|
|
|
|
- @RequestParam(required = false) Double groupEndScore, @RequestParam(required = false) Double questionScore) {
|
|
|
|
|
|
+ @RequestParam(required = false) Double mainStartScore, @RequestParam(required = false) Double mainEndScore,
|
|
|
|
+ @RequestParam(required = false) Double questionScore) {
|
|
int examId = getSessionExamId(request);
|
|
int examId = getSessionExamId(request);
|
|
WebUser wu = RequestUtils.getWebUser(request);
|
|
WebUser wu = RequestUtils.getWebUser(request);
|
|
query.setExamId(examId);
|
|
query.setExamId(examId);
|
|
@@ -109,13 +108,12 @@ public class InspectedController extends BaseExamController {
|
|
query.addStatus(SubjectiveStatus.INSPECTED);
|
|
query.addStatus(SubjectiveStatus.INSPECTED);
|
|
query.addStatus(SubjectiveStatus.MARKED);
|
|
query.addStatus(SubjectiveStatus.MARKED);
|
|
}
|
|
}
|
|
- if (groupNumber != null || groupStartScore != null || groupEndScore != null || questionScore != null) {
|
|
|
|
|
|
+ if (mainStartScore != null || mainEndScore != null || questionScore != null) {
|
|
SubjectiveScoreSearchQuery query2 = new SubjectiveScoreSearchQuery();
|
|
SubjectiveScoreSearchQuery query2 = new SubjectiveScoreSearchQuery();
|
|
query2.setExamId(examId);
|
|
query2.setExamId(examId);
|
|
query2.setSubjectCode(query.getSubjectCode());
|
|
query2.setSubjectCode(query.getSubjectCode());
|
|
- query2.setGroupNumber(groupNumber);
|
|
|
|
- query2.setGroupStartScore(groupStartScore);
|
|
|
|
- query2.setGroupEndScore(groupEndScore);
|
|
|
|
|
|
+ query2.setMainStartScore(mainStartScore);
|
|
|
|
+ query2.setMainEndScore(mainEndScore);
|
|
query2.setScore(questionScore);
|
|
query2.setScore(questionScore);
|
|
query2.setPageSize(Integer.MAX_VALUE);
|
|
query2.setPageSize(Integer.MAX_VALUE);
|
|
List<Integer> studentIds = scoreService.findStudentIdByQuery(query2);
|
|
List<Integer> studentIds = scoreService.findStudentIdByQuery(query2);
|
|
@@ -136,9 +134,8 @@ public class InspectedController extends BaseExamController {
|
|
model.addAttribute("query", query);
|
|
model.addAttribute("query", query);
|
|
model.addAttribute("inspectCount", inspectCount);
|
|
model.addAttribute("inspectCount", inspectCount);
|
|
model.addAttribute("groupList", groupList);
|
|
model.addAttribute("groupList", groupList);
|
|
- model.addAttribute("groupNumber", groupNumber);
|
|
|
|
- model.addAttribute("groupStartScore", groupStartScore);
|
|
|
|
- model.addAttribute("groupEndScore", groupEndScore);
|
|
|
|
|
|
+ model.addAttribute("mainStartScore", mainStartScore);
|
|
|
|
+ model.addAttribute("mainEndScore", mainEndScore);
|
|
model.addAttribute("questionScore", questionScore);
|
|
model.addAttribute("questionScore", questionScore);
|
|
model.addAttribute("subjectList", subjectList);
|
|
model.addAttribute("subjectList", subjectList);
|
|
model.addAttribute("statusList", SubjectiveStatus.getOptionList());
|
|
model.addAttribute("statusList", SubjectiveStatus.getOptionList());
|
|
@@ -151,8 +148,8 @@ public class InspectedController extends BaseExamController {
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public ModelAndView start(HttpServletRequest request, RedirectAttributes redirectAttributes,
|
|
public ModelAndView start(HttpServletRequest request, RedirectAttributes redirectAttributes,
|
|
ExamStudentSearchQuery query, @RequestParam(required = false) Integer groupNumber,
|
|
ExamStudentSearchQuery query, @RequestParam(required = false) Integer groupNumber,
|
|
- @RequestParam(required = false) Double groupStartScore,
|
|
|
|
- @RequestParam(required = false) Double groupEndScore, @RequestParam(required = false) Double questionScore) {
|
|
|
|
|
|
+ @RequestParam(required = false) Double mainStartScore, @RequestParam(required = false) Double mainEndScore,
|
|
|
|
+ @RequestParam(required = false) Double questionScore) {
|
|
int examId = getSessionExamId(request);
|
|
int examId = getSessionExamId(request);
|
|
WebUser wu = RequestUtils.getWebUser(request);
|
|
WebUser wu = RequestUtils.getWebUser(request);
|
|
releaseByUser(wu.getUser().getId());
|
|
releaseByUser(wu.getUser().getId());
|
|
@@ -167,13 +164,12 @@ public class InspectedController extends BaseExamController {
|
|
if (query.getSubjectCode() == null && !subjectList.isEmpty()) {
|
|
if (query.getSubjectCode() == null && !subjectList.isEmpty()) {
|
|
query.setSubjectCode(subjectList.get(0).getCode());
|
|
query.setSubjectCode(subjectList.get(0).getCode());
|
|
}
|
|
}
|
|
- if (groupNumber != null || groupStartScore != null || groupEndScore != null || questionScore != null) {
|
|
|
|
|
|
+ if (mainStartScore != null || mainEndScore != null || questionScore != null) {
|
|
SubjectiveScoreSearchQuery query2 = new SubjectiveScoreSearchQuery();
|
|
SubjectiveScoreSearchQuery query2 = new SubjectiveScoreSearchQuery();
|
|
query2.setExamId(examId);
|
|
query2.setExamId(examId);
|
|
query2.setSubjectCode(query.getSubjectCode());
|
|
query2.setSubjectCode(query.getSubjectCode());
|
|
- query2.setGroupNumber(groupNumber);
|
|
|
|
- query2.setGroupStartScore(groupStartScore);
|
|
|
|
- query2.setGroupEndScore(groupEndScore);
|
|
|
|
|
|
+ query2.setMainStartScore(mainStartScore);
|
|
|
|
+ query2.setMainEndScore(mainEndScore);
|
|
query2.setScore(questionScore);
|
|
query2.setScore(questionScore);
|
|
query2.setPageSize(Integer.MAX_VALUE);
|
|
query2.setPageSize(Integer.MAX_VALUE);
|
|
List<Integer> studentIds = scoreService.findStudentIdByQuery(query2);
|
|
List<Integer> studentIds = scoreService.findStudentIdByQuery(query2);
|