|
@@ -357,10 +357,12 @@ public class LibraryController extends BaseExamController {
|
|
lockService.watch(LockType.EXAM_SUBJECT, library.getExamId(), library.getSubjectCode());
|
|
lockService.watch(LockType.EXAM_SUBJECT, library.getExamId(), library.getSubjectCode());
|
|
lockService.watch(LockType.GROUP, library.getExamId(), library.getSubjectCode(),
|
|
lockService.watch(LockType.GROUP, library.getExamId(), library.getSubjectCode(),
|
|
library.getGroupNumber());
|
|
library.getGroupNumber());
|
|
- if ((library.getStatus().equals(LibraryStatus.MARKED)
|
|
|
|
- || library.getStatus().equals(LibraryStatus.PROBLEM) || library.getStatus().equals(
|
|
|
|
- LibraryStatus.INSPECTED))
|
|
|
|
|
|
+ if (libraryService.hasApplied(library, wu.getId())
|
|
|
|
+ && (library.getStatus().equals(LibraryStatus.MARKED)
|
|
|
|
+ || library.getStatus().equals(LibraryStatus.PROBLEM) || library.getStatus().equals(
|
|
|
|
+ LibraryStatus.INSPECTED))
|
|
&& markService.rejectLibrary(library, rejectResult.getQuestionList(), wu.getId())) {
|
|
&& markService.rejectLibrary(library, rejectResult.getQuestionList(), wu.getId())) {
|
|
|
|
+ libraryService.releaseByLibrary(library);
|
|
obj.accumulate("success", true);
|
|
obj.accumulate("success", true);
|
|
} else {
|
|
} else {
|
|
obj.accumulate("success", false);
|
|
obj.accumulate("success", false);
|