|
@@ -571,11 +571,15 @@ public class MarkServiceImpl implements MarkService {
|
|
|
}
|
|
|
} else if (group.getStatus() == MarkStatus.TRIAL) {
|
|
|
TrialLibrary library = trialLibraryDao.findOne(result.getLibraryId());
|
|
|
- if (library != null && hasApplied(library, marker) && library.getExamId().equals(group.getExamId())
|
|
|
+ if (library != null && library.getExamId().equals(group.getExamId())
|
|
|
&& library.getSubjectCode().equals(group.getSubjectCode())
|
|
|
&& library.getGroupNumber().equals(group.getNumber())
|
|
|
&& result.getMarkerScore() <= group.getTotalScore()
|
|
|
&& StringUtils.isNotBlank(result.getScoreList())) {
|
|
|
+ if ((library.getMarkerId() == null && !hasApplied(library, marker))
|
|
|
+ || (library.getMarkerId() != null && !library.getMarkerId().equals(marker.getId()))) {
|
|
|
+ return SubmitResult.faile();
|
|
|
+ }
|
|
|
library.setMarkerId(marker.getId());
|
|
|
library.setMarkerTime(new Date());
|
|
|
library.setMarkerScore(result.getMarkerScore());
|