|
@@ -96,7 +96,7 @@ public class PaperService {
|
|
return papers;
|
|
return papers;
|
|
}
|
|
}
|
|
|
|
|
|
- public Paper getOnePaper(Long id) {
|
|
|
|
|
|
+ public Paper getOneWithAuth(Long id) {
|
|
AuthUser user = SecurityUtil.getCurrentUser();
|
|
AuthUser user = SecurityUtil.getCurrentUser();
|
|
boolean student = Constants.USER_TYPE_STUDENT.equals(user.getUser().getUserType());
|
|
boolean student = Constants.USER_TYPE_STUDENT.equals(user.getUser().getUserType());
|
|
Paper paper = paperRepo.findById(id).orElse(null);
|
|
Paper paper = paperRepo.findById(id).orElse(null);
|
|
@@ -140,6 +140,16 @@ public class PaperService {
|
|
return paper;
|
|
return paper;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public Paper getOnePaper(Long id) {
|
|
|
|
+ Paper paper = paperRepo.findById(id).orElse(null);
|
|
|
|
+ if (paper == null || paper.getStatus() == Constants.NOTREADY) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ List<Question> questions = questionRepo.findByPidOrderBySectionAscNumberAsc(id);
|
|
|
|
+ paper.setQuestions(questions);
|
|
|
|
+ return paper;
|
|
|
|
+ }
|
|
|
|
+
|
|
public Result add(Paper paper) {
|
|
public Result add(Paper paper) {
|
|
if (hasPaper(paper.getName(), paper.getTypeId())) {
|
|
if (hasPaper(paper.getName(), paper.getTypeId())) {
|
|
return Result.fail("存在同名试卷");
|
|
return Result.fail("存在同名试卷");
|