Merge branch 'dev_v2.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.0

distributed-print-business/src/main/resources/mapper/TCStatisticsMapper.xml

@@ -13,13 +13,11 @@
         t_c_statistics tcs
         join exam_task et on
         et.course_code = tcs.course_code
-        and et.course_name = tcs.course_name
         and et.teaching_room_id = tcs.teaching_room_id
         join exam_task_detail etd on
         etd.exam_task_id = et.id
         join exam_detail_course edc on
         edc.course_code = tcs.course_code
-        and edc.course_name = tcs.course_name
         and edc.paper_number = et.paper_number
         and edc.school_id = et.school_id
         join exam_detail ed on
@@ -54,7 +52,7 @@
         from
             (
             select
-                tcs.id,
+                distinct tcs.id,
                 tcs.college_id as collegeId,
                 tcs.college_name as collegeName,
                 tcs.course_name as courseName,
@@ -86,13 +84,11 @@
                 t_c_statistics tcs
             join exam_task et on
                 et.course_code = tcs.course_code
-                and et.course_name = tcs.course_name
                 and et.teaching_room_id = tcs.teaching_room_id
             join exam_task_detail etd on
                 etd.exam_task_id = et.id
             join exam_detail_course edc on
                 edc.course_code = tcs.course_code
-                and edc.course_name = tcs.course_name
                 and edc.paper_number = et.paper_number
                 and edc.school_id = et.school_id
             join exam_detail ed on