Browse Source

fix:主客观题导入提示优化

caozixuan 1 year ago
parent
commit
82bd5d0a1c

+ 6 - 10
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -2392,9 +2392,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
             // 1.题号重复校验
             if (SystemConstant.strNotNull(paperNumber) && mainNumber != null && subNumber != null) {
-                logicErrorCommonNotice = String.format("试卷编号为[%s],大题号为[%s],小题号为[%s]的数据异常 : ", paperNumber, mainNumber,
+                logicErrorCommonNotice = String.format("课程代码为[%s],试卷编号为[%s],大题号为[%s],小题号为[%s]的数据异常 : ",courseCode, paperNumber, mainNumber,
                         subNumber);
-                String questionNumberKey = paperNumber + SystemConstant.HYPHEN + mainNumber + SystemConstant.HYPHEN + subNumber;
+                String questionNumberKey = courseCode + SystemConstant.HYPHEN + paperNumber + SystemConstant.HYPHEN + mainNumber + SystemConstant.HYPHEN + subNumber;
                 if (questionNumberCheckSet.contains(questionNumberKey)) {
                     logicErrorList.add("excel中题号重复");
                 } else {
@@ -2421,7 +2421,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     logicErrorList.add("课程编号名称不匹配");
                 }
                 if (markPaperList.stream().noneMatch(m -> m.getPaperNumber().equals(paperNumber) && m.getCourseCode().equals(courseCode))) {
-                    logicErrorList.add("试卷不存在");
+                    logicErrorList.add("考试课程中不存在该试卷,请先创建试卷");
                 }
             }
             // 3.选项越界校验
@@ -2566,21 +2566,17 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             String courseCode = subjectiveStructDto.getCourseCode();
             String courseName = subjectiveStructDto.getCourseName();
             String paperNumber = subjectiveStructDto.getPaperNumber();
-            String mainTitle = subjectiveStructDto.getMainTitle();
             Integer mainNumber = subjectiveStructDto.getMainNumber();
             Integer subNumber = subjectiveStructDto.getSubNumber();
-            Double totalScore = subjectiveStructDto.getTotalScore();
-            Double intervalScore = subjectiveStructDto.getIntervalScore();
-            Integer groupNumber = subjectiveStructDto.getGroupNumber();
             Integer markerCount = subjectiveStructDto.getMarkerCount();
             String markerCodes = subjectiveStructDto.getMarkerCodes();
             String errorMsg = subjectiveStructDto.getErrorMsg();
 
             // 1.题号重复校验
             if (SystemConstant.strNotNull(paperNumber) && mainNumber != null && subNumber != null) {
-                excelErrorCommonNotice = String.format("试卷编号为[%s],大题号为[%s],小题号为[%s]的数据异常 : ", paperNumber, mainNumber,
+                excelErrorCommonNotice = String.format("课程代码为[%s],试卷编号为[%s],大题号为[%s],小题号为[%s]的数据异常 : ",courseCode, paperNumber, mainNumber,
                         subNumber);
-                String questionNumberKey = paperNumber + SystemConstant.HYPHEN + mainNumber + SystemConstant.HYPHEN + subNumber;
+                String questionNumberKey = courseCode + SystemConstant.HYPHEN + paperNumber + SystemConstant.HYPHEN + mainNumber + SystemConstant.HYPHEN + subNumber;
                 if (questionNumberCheckSet.contains(questionNumberKey)) {
                     excelErrorList.add("excel中题号重复");
                 } else {
@@ -2599,7 +2595,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     excelErrorList.add("课程代码名称不匹配");
                 }
                 if (markPaperList.stream().noneMatch(m -> m.getPaperNumber().equals(paperNumber) && m.getCourseCode().equals(courseCode))) {
-                    excelErrorList.add("试卷不存在");
+                    excelErrorList.add("考试课程中不存在该试卷,请先创建试卷");
                 }
             }