caozixuan преди 4 години
родител
ревизия
88c7be39f7

+ 11 - 0
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/CourseInfo.java

@@ -19,6 +19,9 @@ public class CourseInfo {
     @ApiModelProperty(value = "是否缺考")
     private Boolean absent;
 
+    @ApiModelProperty(value = "是否应届")
+    private Boolean studentCurrent;
+
     @ApiModelProperty(value = "是否发布")
     private String publishStatus;
 
@@ -54,6 +57,14 @@ public class CourseInfo {
         this.absent = absent;
     }
 
+    public Boolean getStudentCurrent() {
+        return studentCurrent;
+    }
+
+    public void setStudentCurrent(Boolean studentCurrent) {
+        this.studentCurrent = studentCurrent;
+    }
+
     public String getPublishStatus() {
         return publishStatus;
     }

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

@@ -1,5 +1,7 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -9,6 +11,7 @@ import java.util.List;
  */
 public class ExamInfo {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long examId;
 
     @ApiModelProperty(value = "试卷编号")

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

@@ -340,6 +340,7 @@
             and b.school_id = #{schoolId}
             and a.student_code = #{studentCode}
         </where>
+        GROUP BY a.exam_id , b.exam_code , b.exam_name , b.exam_time
         order by b.exam_time desc
     </select>
     <select id="listCourseByExamIdAndStudentCode"
@@ -349,6 +350,7 @@
             a.course_code courseCode,
             a.course_name courseName,
             a.absent,
+            a.student_current as studentCurrent,
             b.publish_status publishStatus
         FROM
             t_b_exam_student a