|
@@ -139,8 +139,8 @@
|
|
|
exam_detail b ON a.id = b.print_plan_id
|
|
|
JOIN
|
|
|
(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(a.paper_number) paperNumber,
|
|
|
GROUP_CONCAT(IFNULL(a.paper_pages_a3, 0) + IFNULL(a.card_pages_a3, 0)) singlePagesA3,
|
|
@@ -158,12 +158,13 @@
|
|
|
END) isPass
|
|
|
FROM
|
|
|
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
|
|
|
AND a.exam_detail_id = b.exam_detail_id
|
|
|
AND a.course_code = b.course_code
|
|
|
AND a.paper_number = b.paper_number
|
|
|
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
|
|
|
sys_user e ON b.print_user = e.login_name
|
|
|
LEFT JOIN
|
|
@@ -231,8 +232,8 @@
|
|
|
exam_detail b ON a.id = b.print_plan_id
|
|
|
JOIN
|
|
|
(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(a.paper_number) paperNumber,
|
|
|
GROUP_CONCAT(IFNULL(a.paper_pages_a3, 0) + IFNULL(a.card_pages_a3, 0)) singlePagesA3,
|
|
@@ -250,12 +251,13 @@
|
|
|
END) isPass
|
|
|
FROM
|
|
|
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
|
|
|
AND a.exam_detail_id = b.exam_detail_id
|
|
|
AND a.course_code = b.course_code
|
|
|
AND a.paper_number = b.paper_number
|
|
|
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
|
|
|
sys_user e ON b.print_user = e.login_name
|
|
|
LEFT JOIN
|