Browse Source

1.0.4 bug

xiaofei 1 year ago
parent
commit
3d9ebe1cf5

+ 6 - 2
paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/ExamStudentServiceImpl.java

@@ -285,8 +285,10 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
             }
             }
             if (courseMap.containsKey(basicStudent.getCourseCode())) {
             if (courseMap.containsKey(basicStudent.getCourseCode())) {
                 if (!basicStudent.getCourseName().equals(courseMap.get(basicStudent.getCourseCode()))) {
                 if (!basicStudent.getCourseName().equals(courseMap.get(basicStudent.getCourseCode()))) {
-                    errorMsg.add("课程代码已存在课程名称[" + courseMap.get(basicStudent.getCourseCode()) + "]");
+                    errorMsg.add("课程代码["+basicStudent.getCourseCode()+"]已存在多个课程名称[" + courseMap.get(basicStudent.getCourseCode()) + ","+basicStudent.getCourseName()+"]");
                 }
                 }
+            } else {
+                courseMap.put(basicStudent.getCourseCode(), basicStudent.getCourseName());
             }
             }
             // 考生在同课程下重复
             // 考生在同课程下重复
             if (studentCodeMap.containsKey(basicStudent.getCourseCode())) {
             if (studentCodeMap.containsKey(basicStudent.getCourseCode())) {
@@ -295,12 +297,14 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
                     studentCodeMap.put(basicStudent.getCourseCode(), new ArrayList<>());
                     studentCodeMap.put(basicStudent.getCourseCode(), new ArrayList<>());
                 } else {
                 } else {
                     if (studentCodeList.contains(basicStudent.getStudentCode())) {
                     if (studentCodeList.contains(basicStudent.getStudentCode())) {
-                        errorMsg.add("学号在同课程下已存在");
+                        errorMsg.add("学号[" + basicStudent.getStudentCode() + "]在同课程下已存在");
                     } else {
                     } else {
                         studentCodeList.add(basicStudent.getStudentCode());
                         studentCodeList.add(basicStudent.getStudentCode());
                         studentCodeMap.put(basicStudent.getCourseCode(), studentCodeList);
                         studentCodeMap.put(basicStudent.getCourseCode(), studentCodeList);
                     }
                     }
                 }
                 }
+            } else {
+                studentCodeMap.put(basicStudent.getCourseCode(), Arrays.asList(basicStudent.getStudentCode()));
             }
             }
 
 
             if (StringUtils.isNotBlank(errorMsg.toString())) {
             if (StringUtils.isNotBlank(errorMsg.toString())) {