Merge remote-tracking branch 'origin/main'

bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java

@@ -221,8 +221,8 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService {
             task.setAnnotatorId(String.valueOf(userId));
 
             if ("1".equals(annotationStatus)) {
-                //已标注文件列表
-                task.setFileAnnotationStatus("1");
+                //已标注文件列表包含已审核
+                task.setFileAnnotationStatus("1,2");
             }else if ("2".equals(annotationStatus)){
                 //未标注文件列表
                 task.setFileAnnotationStatus("0");

bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml

@@ -255,9 +255,15 @@
         <if test="reviewerId != null and reviewerId != ''">
             AND atap.reviewer_id = #{reviewerId}
         </if>
-        <if test="fileAnnotationStatus != null and fileAnnotationStatus != '' ">
-            AND atap.annotation_status = #{fileAnnotationStatus}
+        <if test="fileAnnotationStatus != null and fileAnnotationStatus != ''">
+            AND atap.annotation_status IN
+            <foreach item="status" collection="fileAnnotationStatus.split(',')" open="(" close=")" separator=",">
+                #{status}
+            </foreach>
         </if>
+<!--        <if test="fileAnnotationStatus != null and fileAnnotationStatus != '' ">-->
+<!--            AND atap.annotation_status = #{fileAnnotationStatus}-->
+<!--        </if>-->
     </select>
 
     <!-- 根据taskid 和fileid 返回审核驳回的原因-->