|
@@ -217,16 +217,18 @@ public class LibraryController extends BaseExamController {
|
|
|
@RequestParam(required = false) Integer groupNumber) {
|
|
|
int examId = getSessionExamId(request);
|
|
|
ExamStudent student = studentService.findById(studentId);
|
|
|
+ List<ExamQuestion> questions = questionService.findByExamAndSubjectAndObjective(examId,
|
|
|
+ student.getSubjectCode(), false);
|
|
|
if (groupNumber != null) {
|
|
|
- List<ExamQuestion> questions = questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
|
|
|
+ questions = questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
|
|
|
student.getSubjectCode(), false, groupNumber);
|
|
|
- List<String> strings = new ArrayList<String>();
|
|
|
- for (ExamQuestion examQuestion : questions) {
|
|
|
- strings.add(examQuestion.getQuestionNumber());
|
|
|
- }
|
|
|
- String questionNumbers = String.join(",", strings);
|
|
|
- model.addAttribute("questionNumbers", questionNumbers);
|
|
|
}
|
|
|
+ List<String> strings = new ArrayList<String>();
|
|
|
+ for (ExamQuestion examQuestion : questions) {
|
|
|
+ strings.add(examQuestion.getQuestionNumber());
|
|
|
+ }
|
|
|
+ String questionNumbers = String.join(",", strings);
|
|
|
+ model.addAttribute("questionNumbers", questionNumbers);
|
|
|
model.addAttribute("fileServer", fileService.getFileServer());
|
|
|
model.addAttribute("answerUrl", fileService.getJsonUri(student.getExamId(), student.getSecretNumber()));
|
|
|
model.addAttribute("paperUrl",
|