Преглед на файлове

add:
1.不支持大条码

caozixuan преди 1 година
родител
ревизия
76b8f30789
променени са 1 файла, в които са добавени 9 реда и са изтрити 19 реда
  1. 9 19
      src/main/java/cn/com/qmth/print/manage/service/impl/ExamStudentServiceImpl.java

+ 9 - 19
src/main/java/cn/com/qmth/print/manage/service/impl/ExamStudentServiceImpl.java

@@ -70,27 +70,16 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentDao, ExamStud
         if (StringUtils.isEmpty(examNumber)) {
             throw new StatusException("准考证号不能为空");
         }
-        ExamStudentEntity result;
-        // 判断examNumber是否为大条码(学号)
-        ExamStudentEntity checkStudentCode = this.getOne(new QueryWrapper<ExamStudentEntity>()
+        // 判断examNumber是否为小条码(去掉末尾和examNumber)
+        String smallExamNumber = examNumber.substring(0, examNumber.length() - 1);
+        ExamStudentEntity checkExamNumber = this.getOne(new QueryWrapper<ExamStudentEntity>()
                 .lambda()
                 .eq(ExamStudentEntity::getExamId, examId)
-                .eq(ExamStudentEntity::getStudentCode, examNumber));
-        if (Objects.nonNull(checkStudentCode)) {
-            result = checkStudentCode;
-        } else {
-            // 判断examNumber是否为小条码(去掉末尾和examNumber)
-            String smallExamNumber = examNumber.substring(0, examNumber.length() - 1);
-            ExamStudentEntity checkExamNumber = this.getOne(new QueryWrapper<ExamStudentEntity>()
-                    .lambda()
-                    .eq(ExamStudentEntity::getExamId, examId)
-                    .eq(ExamStudentEntity::getExamNumber, smallExamNumber));
-            if (Objects.isNull(checkExamNumber)) {
-                throw new StatusException("未找到考生[" + examNumber + "]");
-            }
-            result = checkExamNumber;
+                .eq(ExamStudentEntity::getExamNumber, smallExamNumber));
+        if (Objects.isNull(checkExamNumber)) {
+            throw new StatusException("未找到考生[" + examNumber + "]");
         }
-        return result;
+        return checkExamNumber;
     }
 
     @Override
@@ -161,6 +150,7 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentDao, ExamStud
                 String name = dto.getName();
                 String subjectCode = dto.getCourseCode();
                 String subjectName = dto.getCourseName();
+                String examSite = dto.getExamSite();
 
                 if (examNumber == null || examNumber.length() == 0) {
                     nullError = nullError + "[准考证号]";
@@ -289,7 +279,7 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentDao, ExamStud
                     examStudentEntity.setStudentCode(studentCode);
                     examStudentEntity.setName(name);
                     examStudentEntity.setCourseCode(subjectCode.concat(PmConstants.LING_SIGN).concat(subjectName));
-                    examStudentEntity.setExamSite(dto.getExamPlaceName());
+                    examStudentEntity.setExamSite(dto.getExamPlaceCode());
                     examStudentEntity.setSortNo(sort.getAndIncrement());
                     examStudentEntity.setExamUnit(dto.getExamUnit());
                     examStudentEntity.setCreateTime(new Date());