From 782bb6d7e18eaae734765a171f4a73db2e1815fa Mon Sep 17 00:00:00 2001
From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com>
Date: Tue, 3 Dec 2024 13:44:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=A0=87=E6=B3=A8=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=87=8C=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=B7=B2=E6=A0=87?=
 =?UTF-8?q?=E6=B3=A8=E7=9A=84=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=8C=85=E5=90=AB=E5=B7=B2=E5=AE=A1=E6=A0=B8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/dataset/AnnotationTaskServiceImpl.java        |  4 ++--
 .../src/main/resources/mapper/AnnotationTaskMapper.xml | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java
index e422614..05ed38c 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java
+++ b/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");
diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
index 2c8281a..b86c7cd 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
+++ b/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 返回审核驳回的原因-->