浏览代码

课程目标达成度修改

wangliang 1 年之前
父节点
当前提交
df4508ee7e

+ 7 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TRBasicInfoServiceImpl.java

@@ -385,9 +385,12 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         BasicSemester basicSemester = basicSemesterService.selectByExamId(markPaper.getExamId());
         Objects.requireNonNull(basicSemester, "未找到学期信息");
 
-        ExamStudentDto examStudentDto = examStudentService.queryExamStudent(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getPaperNumber());
-        String teachingObject = Objects.nonNull(examStudentDto) ? examStudentDto.getClazzNames() : null;
-        String teacher = Objects.nonNull(examStudentDto) ? examStudentDto.getTeacherNames() : null;
+        String teachingObject = null, teacher = null;
+        if (Objects.nonNull(markPaper.getPaperNumber())) {
+            ExamStudentDto examStudentDto = examStudentService.queryExamStudent(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getPaperNumber());
+            teachingObject = Objects.nonNull(examStudentDto) ? examStudentDto.getClazzNames() : null;
+            teacher = Objects.nonNull(examStudentDto) ? examStudentDto.getTeacherNames() : null;
+        }
 
         if (Objects.isNull(trBasicInfo)) {
             trBasicInfo = new TRBasicInfo(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), teachCourseId, basicSemester.getName(), teachingObject, teacher, null, userId);
@@ -766,7 +769,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
                 rowRenderDataExamStudent[i + 2] = examStudent_row;
             }
 
-            String title = trBasicInfo.getTeachingObject();
+            String title = Objects.nonNull(trBasicInfo.getTeachingObject()) ? trBasicInfo.getTeachingObject() : "";
             String sumTitle = "学生共${examStudentSum}名";
             sumTitle = sumTitle.replace("${examStudentSum}", trExamStudentList.size() - 3 + "");