报告bug修复

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

@@ -7,7 +7,7 @@
         SELECT
         a.assigned_score assignedScore,
         a.student_code studentCode,
-        a.current
+        a.student_current `current`
         FROM
         t_a_exam_course_record a
         LEFT JOIN

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

@@ -80,16 +80,16 @@
         a.ticket_number ticketNumber,
         a.student_code studentCode,
         a.name,
-        case a.current when true then '应届' else '非应届' end as current,
+        case a.student_current when true then '应届' else '非应届' end as current,
         b.objective_score objectiveScore,
         b.subjective_score subjectiveScore,
         b.total_score totalScore,
         c.assigned_score assignedScore,
         e.clazz_code clazzCode,
         e.clazz_name clazzName,
-        f.college_name teachCollegeName,
-        g.college_name inspectCollegeName,
-        h.teacher_name teacherName
+        f.name teachCollegeName,
+        g.name inspectCollegeName,
+        h.real_name teacherName
         FROM
         t_b_exam_student a
         LEFT JOIN
@@ -101,11 +101,11 @@
         LEFT JOIN
         t_b_school_clazz e ON a.clazz_id = e.id
         LEFT JOIN
-        t_b_school_college f ON a.teach_college_id = f.id
+        sys_org f ON a.teach_college_id = f.id
         LEFT JOIN
-        t_b_school_college g ON a.inspect_college_id = g.id
+        sys_org g ON a.inspect_college_id = g.id
         LEFT JOIN
-        t_b_school_teacher h ON a.teacher_id = h.id
+        sys_user h ON a.teacher_id = h.id
         <where>
             and d.school_id = #{schoolId}
             <if test="semester != null and semester != ''">
@@ -118,7 +118,7 @@
                 and a.course_code = = #{courseCode}
             </if>
             <if test="current != null">
-                and a.current = = #{current}
+                and a.student_current = = #{current}
             </if>
             <if test="inspectCollegeId != null">
                 and a.inspect_college_id = = #{inspectCollegeId}
@@ -143,13 +143,13 @@
         a.ticket_number ticketNumber,
         a.student_code studentCode,
         a.name,
-        case a.current when true then '应届' else '非应届' end as current,
+        case a.student_current when true then '应届' else '非应届' end as current,
         c.assigned_score assignedScore,
         e.clazz_code clazzCode,
         e.clazz_name clazzName,
-        f.college_name teachCollegeName,
-        g.college_name inspectCollegeName,
-        h.teacher_name teacherName
+        f.name teachCollegeName,
+        g.name inspectCollegeName,
+        h.real_name teacherName
         FROM
         t_b_exam_student a
         LEFT JOIN
@@ -161,11 +161,11 @@
         LEFT JOIN
         t_b_school_clazz e ON a.clazz_id = e.id
         LEFT JOIN
-        t_b_school_college f ON a.teach_college_id = f.id
+        sys_org f ON a.teach_college_id = f.id
         LEFT JOIN
-        t_b_school_college g ON a.inspect_college_id = g.id
+        sys_org g ON a.inspect_college_id = g.id
         LEFT JOIN
-        t_b_school_teacher h ON a.teacher_id = h.id
+        sys_user h ON a.teacher_id = h.id
         <where>
             and d.school_id = #{schoolId}
             <if test="semester != null and semester != ''">
@@ -178,7 +178,7 @@
                 and a.course_code = = #{courseCode}
             </if>
             <if test="current != null">
-                and a.current = = #{current}
+                and a.student_current = = #{current}
             </if>
             <if test="inspectCollegeId != null">
                 and a.teach_college_id = = #{teachCollegeId}