xiatian 8 luni în urmă
părinte
comite
0a9ea63b0b

+ 10 - 5
src/main/java/cn/com/qmth/scancentral/service/impl/SubjectServiceImpl.java

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