|
@@ -27,7 +27,6 @@ import cn.com.qmth.stmms.biz.exam.dao.SelectiveStudentDao;
|
|
|
import cn.com.qmth.stmms.biz.exam.dao.SubjectiveScoreDao;
|
|
|
import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
|
|
|
import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
|
|
|
-import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
|
|
|
import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
|
|
|
import cn.com.qmth.stmms.biz.exam.model.MarkGroupStudent;
|
|
|
import cn.com.qmth.stmms.biz.exam.model.Marker;
|
|
@@ -1726,6 +1725,8 @@ public class MarkServiceImpl implements MarkService {
|
|
|
if (list == null || list.isEmpty()) {
|
|
|
return false;
|
|
|
}
|
|
|
+ int examId = list.get(0).getExamId();
|
|
|
+ String subjectCode = list.get(0).getSubjectCode();
|
|
|
for (ExamQuestion question : list) {
|
|
|
SelectiveGroup selectiveGroup = selectiveGroupService.findOne(question.getExamId(),
|
|
|
question.getSubjectCode(), question.getMainNumber());
|
|
@@ -1735,10 +1736,7 @@ public class MarkServiceImpl implements MarkService {
|
|
|
if (!question.isObjective() && question.getGroupNumber() != null) {
|
|
|
continue;
|
|
|
} else {
|
|
|
- int examId = question.getExamId();
|
|
|
- String subjectCode = question.getSubjectCode();
|
|
|
boolean objective = question.isObjective();
|
|
|
- ExamSubject subject = subjectService.find(examId, subjectCode);
|
|
|
questionService.deleteById(question.getId());
|
|
|
if (objective) {
|
|
|
examService.updateObjectiveStatus(examId, ObjectiveStatus.WAITING);
|
|
@@ -1762,9 +1760,11 @@ public class MarkServiceImpl implements MarkService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- subjectService.updateScore(examId, subjectCode, objective,
|
|
|
- questionService.sumTotalScore(examId, subject.getCode(), objective));
|
|
|
}
|
|
|
+ subjectService.updateScore(examId, subjectCode, false,
|
|
|
+ questionService.sumTotalScore(examId, subjectCode, false));
|
|
|
+ subjectService.updateScore(examId, subjectCode, true,
|
|
|
+ questionService.sumTotalScore(examId, subjectCode, true));
|
|
|
}
|
|
|
return true;
|
|
|
}
|