Эх сурвалжийг харах

ExamTaskDetail去掉cardId

wangliang 2 жил өмнө
parent
commit
0384b56cc6

+ 3 - 3
distributed-print-business/src/main/resources/mapper/ExamCardMapper.xml

@@ -102,7 +102,7 @@
             c.paper_type paperType
         FROM
             exam_card a
-                JOIN
+                left JOIN
             exam_card_detail b ON a.id = b.card_id
                 JOIN
             exam_task_detail c ON FIND_IN_SET(a.id, REPLACE(substring_index(substring_index(CONVERT((c.paper_attachment_ids ->>'$[*].cardId')
@@ -167,12 +167,12 @@
             d.content
         FROM
             exam_task a
-                JOIN
+                left JOIN
             exam_task_detail b ON a.id = b.exam_task_id
                 JOIN
             exam_card c ON FIND_IN_SET(c.id, REPLACE(substring_index(substring_index(CONVERT((b.paper_attachment_ids ->>'$[*].cardId')
                                                                                              USING utf8), ']', 1), '[',-1),'"',''))
-                JOIN
+                left JOIN
             exam_card_detail d ON c.id = d.card_id
         WHERE
             a.school_id = #{schoolId}

+ 9 - 9
distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -536,8 +536,8 @@
         sys_user d ON a.create_id = d.id
         LEFT JOIN
         basic_card_rule e ON a.card_rule_id = e.id
-        LEFT JOIN
-        exam_card f ON b.card_id = f.id
+        JOIN exam_card f ON FIND_IN_SET(f.id, REPLACE(substring_index(substring_index(CONVERT((b.paper_attachment_ids ->>'$[*].cardId')
+            USING utf8), ']', 1), '[',-1),'"',''))
         LEFT JOIN
         basic_exam be ON a.exam_id = be.id
         LEFT JOIN
@@ -617,20 +617,20 @@
             f.status as flowStatus
         FROM
             exam_task e
-                JOIN
+                left JOIN
             exam_task_detail a on a.exam_task_id = e.id
-                JOIN
+                left JOIN
             exam_task_paper_log c ON a.exam_task_id = c.exam_task_id and c.review = false
                 JOIN
             exam_card b ON FIND_IN_SET(b.id, REPLACE(substring_index(substring_index(CONVERT((a.paper_attachment_ids ->>'$[*].cardId')
                                                                                              USING utf8), ']', 1), '[',-1),'"',''))
-                join
+                left join
             exam_card d on c.card_id = d.id
-                join
+                left join
             t_f_flow_approve f on e.flow_id = f.flow_id
-                join
+                left join
             basic_exam g on e.exam_id = g.id
-                join
+                left join
             basic_semester h on g.semester_id = h.id
         where e.id = #{examTaskId}
     </select>
@@ -723,7 +723,7 @@
             det.paper_confirm_attachment_ids AS paperConfirmAttachmentIds
         FROM
             exam_task_detail det
-                JOIN
+                left JOIN
             exam_task_paper_log log ON det.exam_task_id = log.exam_task_id
                 AND log.review = 0
         WHERE