소스 검색

客户端bug修改

xiaof 4 년 전
부모
커밋
6d162b5453
1개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 8 6
      distributed-print-business/src/main/resources/mapper/ExamPrintPlanMapper.xml

+ 8 - 6
distributed-print-business/src/main/resources/mapper/ExamPrintPlanMapper.xml

@@ -139,8 +139,8 @@
             exam_detail b ON a.id = b.print_plan_id
             exam_detail b ON a.id = b.print_plan_id
                 JOIN
                 JOIN
             (SELECT
             (SELECT
-                    b.exam_detail_id,
-                    b.print_plan_id,
+                    a.exam_detail_id,
+                    c.print_plan_id,
                     GROUP_CONCAT(CONCAT(a.course_name, '(', a.course_code, ')')) courseNameCode,
                     GROUP_CONCAT(CONCAT(a.course_name, '(', a.course_code, ')')) courseNameCode,
                     GROUP_CONCAT(a.paper_number) paperNumber,
                     GROUP_CONCAT(a.paper_number) paperNumber,
                     GROUP_CONCAT(IFNULL(a.paper_pages_a3, 0) + IFNULL(a.card_pages_a3, 0)) singlePagesA3,
                     GROUP_CONCAT(IFNULL(a.paper_pages_a3, 0) + IFNULL(a.card_pages_a3, 0)) singlePagesA3,
@@ -158,12 +158,13 @@
                     END) isPass
                     END) isPass
             FROM
             FROM
                 exam_detail_course a
                 exam_detail_course a
+            LEFT JOIN exam_detail c ON a.exam_detail_id = c.id
             LEFT JOIN client_status b ON a.school_id = b.school_id
             LEFT JOIN client_status b ON a.school_id = b.school_id
                 AND a.exam_detail_id = b.exam_detail_id
                 AND a.exam_detail_id = b.exam_detail_id
                 AND a.course_code = b.course_code
                 AND a.course_code = b.course_code
                 AND a.paper_number = b.paper_number
                 AND a.paper_number = b.paper_number
                 AND b.machine_code = #{machineCode}
                 AND b.machine_code = #{machineCode}
-            GROUP BY b.exam_detail_id, b.print_plan_id) c ON a.id = c.print_plan_id and b.id = c.exam_detail_id
+            GROUP BY a.exam_detail_id , c.print_plan_id) c ON a.id = c.print_plan_id and b.id = c.exam_detail_id
                 LEFT JOIN
                 LEFT JOIN
             sys_user e ON b.print_user = e.login_name
             sys_user e ON b.print_user = e.login_name
                 LEFT JOIN
                 LEFT JOIN
@@ -231,8 +232,8 @@
             exam_detail b ON a.id = b.print_plan_id
             exam_detail b ON a.id = b.print_plan_id
         JOIN
         JOIN
             (SELECT
             (SELECT
-                b.exam_detail_id,
-                b.print_plan_id,
+                a.exam_detail_id,
+                c.print_plan_id,
                 GROUP_CONCAT(CONCAT(a.course_name, '(', a.course_code, ')')) courseNameCode,
                 GROUP_CONCAT(CONCAT(a.course_name, '(', a.course_code, ')')) courseNameCode,
                 GROUP_CONCAT(a.paper_number) paperNumber,
                 GROUP_CONCAT(a.paper_number) paperNumber,
                 GROUP_CONCAT(IFNULL(a.paper_pages_a3, 0) + IFNULL(a.card_pages_a3, 0)) singlePagesA3,
                 GROUP_CONCAT(IFNULL(a.paper_pages_a3, 0) + IFNULL(a.card_pages_a3, 0)) singlePagesA3,
@@ -250,12 +251,13 @@
                     END) isPass
                     END) isPass
         FROM
         FROM
             exam_detail_course a
             exam_detail_course a
+                LEFT JOIN exam_detail c ON a.exam_detail_id = c.id
                 LEFT JOIN client_status b ON a.school_id = b.school_id
                 LEFT JOIN client_status b ON a.school_id = b.school_id
                 AND a.exam_detail_id = b.exam_detail_id
                 AND a.exam_detail_id = b.exam_detail_id
                 AND a.course_code = b.course_code
                 AND a.course_code = b.course_code
                 AND a.paper_number = b.paper_number
                 AND a.paper_number = b.paper_number
                 AND b.machine_code = #{machineCode}
                 AND b.machine_code = #{machineCode}
-        GROUP BY b.exam_detail_id, b.print_plan_id) c ON a.id = c.print_plan_id and b.id = c.exam_detail_id
+        GROUP BY a.exam_detail_id , c.print_plan_id) c ON a.id = c.print_plan_id and b.id = c.exam_detail_id
             LEFT JOIN
             LEFT JOIN
         sys_user e ON b.print_user = e.login_name
         sys_user e ON b.print_user = e.login_name
             LEFT JOIN
             LEFT JOIN