Merge remote-tracking branch 'origin/dev_v3.3.1' into dev_v3.3.1

teachcloud-mark/src/main/resources/mapper/MarkArbitrateHistoryMapper.xml

@@ -48,10 +48,12 @@
                             1
                         FROM
                             mark_user_class muc
+                                join
+                            mark_user_group mug ON muc.exam_id = mug.exam_id AND muc.paper_number = mug.paper_number AND muc.user_id = mug.user_id
                         WHERE
                             mah.exam_id = muc.exam_id
                             AND mah.paper_number = muc.paper_number
-                            AND mah.group_number = muc.group_number
+                            AND mah.group_number = mug.group_number
                             AND muc.class_name = #{className}
                             AND EXISTS( SELECT
                                     1
@@ -101,10 +103,12 @@
                           1
                       FROM
                           mark_user_class muc
-                      WHERE
+                            join
+                          mark_user_group mug ON muc.exam_id = mug.exam_id AND muc.paper_number = mug.paper_number AND muc.user_id = mug.user_id
+              WHERE
                           mah.exam_id = muc.exam_id
                         AND mah.paper_number = muc.paper_number
-                        AND mah.group_number = muc.group_number
+                        AND mah.group_number = mug.group_number
                         AND muc.class_name = #{className}
                         AND EXISTS( SELECT
                                         1

teachcloud-mark/src/main/resources/mapper/MarkTaskMapper.xml

@@ -238,10 +238,12 @@
                               1
                           FROM
                               mark_user_class muc
+                                left join
+                              mark_user_group mug on muc.exam_id = mug.exam_id and muc.paper_nubmer = mug.paper_number and muc.user_id = mug.user_id
                           WHERE
                               mt.exam_id = muc.exam_id
                             AND mt.paper_number = muc.paper_number
-                            AND mt.group_number = muc.group_number
+                            AND mt.group_number = mug.group_number
                             AND muc.class_name = #{className}
                             AND EXISTS( SELECT
                               1

teachcloud-mark/src/main/resources/mapper/MarkUserGroupMapper.xml

@@ -73,7 +73,6 @@
                 AND EXISTS (select 1 from mark_user_class muc
                             where mug.exam_id = muc.exam_id
                               and mug.paper_number = muc.paper_number
-                              and mug.group_number = muc.group_number
                               and mug.user_id = muc.user_id
                               and muc.class_name = #{className})
             </if>
@@ -107,7 +106,6 @@
                 AND EXISTS (select 1 from mark_user_class muc
                     where mug.exam_id = muc.exam_id
                         and mug.paper_number = muc.paper_number
-                        and mug.group_number = muc.group_number
                         and mug.user_id = muc.user_id
                         and muc.class_name = #{className})
             </if>