yangdamao 1 vuosi sitten
vanhempi
commit
028062e92a

+ 9 - 16
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamPaperMapper.xml

@@ -24,10 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             DISTINCT ep.paper_id,
             ep.paper_name
         FROM
-            exam e
-                LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
-        WHERE
-                e.exam_id IN (
+            (
                 SELECT
                     exam_id
                 FROM
@@ -40,16 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                     concat(
                                             IFNULL(( SELECT GROUP_CONCAT( major_id ) eids FROM goods_attached WHERE goods_id = #{goodsId} AND type = 2 ), '' ),
                                             ',',
-                                            IFNULL(
-                                                    (
-                                                        SELECT
-                                                            GROUP_CONCAT( chapter_exam_id ) eids2
-                                                        FROM
-                                                            question_module_chapter
-                                                        WHERE
-                                                                module_exam_id IN ( SELECT major_id FROM goods_attached WHERE goods_id = #{goodsId} AND type = 1 )),
-                                                    ''
-                                                )))) UNION
+                                            IFNULL(( SELECT GROUP_CONCAT( chapter_exam_id ) eids2 FROM question_module_chapter WHERE module_exam_id IN ( SELECT major_id FROM goods_attached WHERE goods_id = #{goodsId} AND type = 1 )), '' ))))
+                UNION
                 SELECT
                     major_id AS exam_id
                 FROM
@@ -57,8 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHERE
                     goods_id = #{goodsId}
                   AND type = 3
-            )
-          AND e.exam_paper_id IS NOT NULL AND ep.`status` != -1
+            ) a
+                LEFT JOIN exam e ON a.exam_id = e.exam_id
+            exam e
+                LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE
+            e.exam_paper_id IS NOT NULL AND ep.`status` != -1
     </select>
 
     <select id="getGoodsExamPaperByGoodsIds" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.exam.vo.ExamPaperVo">