0826bug

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/ExamInfo.java

@@ -1,10 +1,13 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Date: 2021/6/9.
@@ -26,6 +29,9 @@ public class ExamInfo {
     @ApiModelProperty(value = "课程信息")
     private List<CourseInfo> courseInfo;
 
+    @ApiModelProperty(value = "学期（title）")
+    private String semester;
+
     public Long getExamId() {
         return examId;
     }
@@ -65,4 +71,16 @@ public class ExamInfo {
     public void setCourseInfo(List<CourseInfo> courseInfo) {
         this.courseInfo = courseInfo;
     }
+
+    public String getSemester() {
+        if (Objects.nonNull(semester)) {
+            return SemesterEnum.valueOf(semester).getTitle();
+        } else {
+            return null;
+        }
+    }
+
+    public void setSemester(String semester) {
+        this.semester = semester;
+    }
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamStudentServiceImpl.java

@@ -321,12 +321,6 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         List<ExamInfo> examInfo = tbExamStudentMapper.listExamBySchoolIdAndStudentCode(schoolId, studentCode);
         if (Objects.isNull(examInfo) || examInfo.size() == 0) {
             examInfo = new ArrayList<>();
-            ExamInfo tmpE = new ExamInfo();
-            List<CourseInfo> courseInfos = new ArrayList<>();
-            CourseInfo courseInfo = new CourseInfo();
-            courseInfos.add(courseInfo);
-            tmpE.setCourseInfo(courseInfos);
-            examInfo.add(tmpE);
         }else {
             for (ExamInfo info : examInfo) {
                 List<CourseInfo> courseInfos = tbExamStudentMapper.listCourseByExamIdAndStudentCode(schoolId, info.getExamId(), studentCode);

teachcloud-report-business/src/main/resources/mapper/TBExamStudentMapper.xml

@@ -326,7 +326,8 @@
             a.exam_id examId,
             b.exam_code examCode,
             b.exam_name examName,
-            b.exam_time createTime
+            b.exam_time createTime,
+            b.semester as semester
         FROM
             t_b_exam_student a
                 LEFT JOIN