|
@@ -310,7 +310,10 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
|
|
req.setSubjectCode(subjectCode);
|
|
req.setSubjectCode(subjectCode);
|
|
int scount = studentService.countCetMarking(req);
|
|
int scount = studentService.countCetMarking(req);
|
|
if (scount == 0) {
|
|
if (scount == 0) {
|
|
- throw new StatusException("没有考生信息");
|
|
|
|
|
|
+ throw new ParameterException("没有考生信息");
|
|
|
|
+ }
|
|
|
|
+ if (StringUtils.isBlank(examService.getById(examId).getScanSite())) {
|
|
|
|
+ throw new ParameterException("扫描点代码未设置");
|
|
}
|
|
}
|
|
DataExportTaskVo vo = new DataExportTaskVo();
|
|
DataExportTaskVo vo = new DataExportTaskVo();
|
|
vo.setTaskId(FastUUID.get());
|
|
vo.setTaskId(FastUUID.get());
|
|
@@ -333,7 +336,10 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
|
|
req.setSubjectCode(subjectCode);
|
|
req.setSubjectCode(subjectCode);
|
|
int scount = studentService.countCetMarking(req);
|
|
int scount = studentService.countCetMarking(req);
|
|
if (scount == 0) {
|
|
if (scount == 0) {
|
|
- throw new StatusException("没有考生信息");
|
|
|
|
|
|
+ throw new ParameterException("没有考生信息");
|
|
|
|
+ }
|
|
|
|
+ if (StringUtils.isBlank(examService.getById(examId).getScanSite())) {
|
|
|
|
+ throw new ParameterException("扫描点代码未设置");
|
|
}
|
|
}
|
|
DataExportTaskVo vo = new DataExportTaskVo();
|
|
DataExportTaskVo vo = new DataExportTaskVo();
|
|
vo.setTaskId(FastUUID.get());
|
|
vo.setTaskId(FastUUID.get());
|
|
@@ -489,8 +495,7 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
|
|
int site = Integer.valueOf(data.getExamNumber().substring(10, 13));
|
|
int site = Integer.valueOf(data.getExamNumber().substring(10, 13));
|
|
MarkSiteEntity cm = cms.get(data.getSubjectCode() + "-" + data.getPaperType());
|
|
MarkSiteEntity cm = cms.get(data.getSubjectCode() + "-" + data.getPaperType());
|
|
if (cm == null) {
|
|
if (cm == null) {
|
|
- throw new StatusException("未找到评卷点数据,SubjectCode:" + data.getSubjectCode() + " PaperType:"
|
|
|
|
- + data.getPaperType());
|
|
|
|
|
|
+ throw new StatusException("未找到评卷点数据,条码值:" + data.getPaperType());
|
|
}
|
|
}
|
|
if (site % 2 == 0) {
|
|
if (site % 2 == 0) {
|
|
markingCode = cm.getEvenNumber();
|
|
markingCode = cm.getEvenNumber();
|
|
@@ -645,7 +650,7 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
|
|
int site = Integer.valueOf(data.getExamNumber().substring(10, 13));
|
|
int site = Integer.valueOf(data.getExamNumber().substring(10, 13));
|
|
MarkSiteEntity cm = cms.get(data.getPaperType());
|
|
MarkSiteEntity cm = cms.get(data.getPaperType());
|
|
if (cm == null) {
|
|
if (cm == null) {
|
|
- throw new StatusException("未找到考点数据,PaperType:" + data.getPaperType());
|
|
|
|
|
|
+ throw new StatusException("未找到评卷点数据,条码值:" + data.getPaperType());
|
|
}
|
|
}
|
|
if (site % 2 == 0) {
|
|
if (site % 2 == 0) {
|
|
markingCode = cm.getEvenNumber();
|
|
markingCode = cm.getEvenNumber();
|