|
@@ -372,6 +372,20 @@ public class ExamService {
|
|
|
List<LearnExaminee> examineeList = examineeMapper.selectLearnExamineeList(examinee);
|
|
List<LearnExaminee> examineeList = examineeMapper.selectLearnExamineeList(examinee);
|
|
|
Set<Long> existPaperIdSet = Sets.newHashSet();
|
|
Set<Long> existPaperIdSet = Sets.newHashSet();
|
|
|
for(LearnExaminee e : examineeList) {
|
|
for(LearnExaminee e : examineeList) {
|
|
|
|
|
+ if(ExamineeStatus.Sign.getVal().equals(e.getState())) {
|
|
|
|
|
+ LearnPaper learnPaper = paperMapper.selectLearnPaperById(e.getPaperId());
|
|
|
|
|
+ AnswerSheet answerSheet = buildAnswerSheet(learnPaper, examinee);
|
|
|
|
|
+ if(null != e.getPaperInfo()) {
|
|
|
|
|
+ JSONObject info = JSONObject.parseObject(e.getPaperInfo());
|
|
|
|
|
+ answerSheet.setCollegeId(info.getLong("universityId"));
|
|
|
|
|
+ answerSheet.setCollegeName(info.getString("universityName"));
|
|
|
|
|
+ answerSheet.setMajorId(info.getLong("planId"));
|
|
|
|
|
+ answerSheet.setMajorName(info.getString("majorName"));
|
|
|
|
|
+ answerSheet.setSubjectId(learnPaper.getSubjectId());
|
|
|
|
|
+ answerSheet.setSubjectName(dzSubjectService.selectDzSubjectBySubjectId(learnPaper.getSubjectId()).getSubjectName());
|
|
|
|
|
+ }
|
|
|
|
|
+ return answerSheet;
|
|
|
|
|
+ }
|
|
|
existPaperIdSet.add(e.getPaperId());
|
|
existPaperIdSet.add(e.getPaperId());
|
|
|
}
|
|
}
|
|
|
JSONObject evalCountObj = JSONObject.parseObject(sysUser.getEvalCounts());
|
|
JSONObject evalCountObj = JSONObject.parseObject(sysUser.getEvalCounts());
|