From 8877989f8557075c47b47831f08ab7ed3142b7f3 Mon Sep 17 00:00:00 2001
From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com>
Date: Thu, 28 Nov 2024 12:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=B7=E4=BD=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/AnnotationTaskController.java         |  4 ++--
 .../Impl/dataset/AnnotationTaskServiceImpl.java   | 15 ++++++++++-----
 .../resources/mapper/AnnotationTaskMapper.xml     |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/dataset/AnnotationTaskController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/dataset/AnnotationTaskController.java
index 6d4f28b..3d5324a 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/dataset/AnnotationTaskController.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/dataset/AnnotationTaskController.java
@@ -223,7 +223,7 @@ public class AnnotationTaskController extends BaseController {
      * @return 标注任务列表
      */
     @RequiresPermissions("dataCenter:no_annotation_task:list:status")
-    @GetMapping(value = "/getMyNoAnnotatedTask/")
+    @GetMapping(value = "/getMyNoAnnotatedTask")
     public AjaxResult getMyNoAnnotationTask() {
         try {
 
@@ -238,7 +238,7 @@ public class AnnotationTaskController extends BaseController {
      * @return 审核任务列表
      */
     @RequiresPermissions("dataCenter:no_audit_task:list:status")
-    @GetMapping(value = "/getMyNoAuditedTask/")
+    @GetMapping(value = "/getMyNoAuditedTask")
     public AjaxResult getMyNoAuditTask() {
         try {
             List<AnnotationTaskEntity> dataSetBasicFile = annotationTaskService.getMyNoAuditTask();
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 b453252..3accb2f 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
@@ -215,11 +215,16 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService {
             AnnotationTaskEntity task = new AnnotationTaskEntity();
             task.setTaskId(taskId);
             task.setAnnotatorId(String.valueOf(userId));
-            Long intAnnotationStatus = Long.valueOf(annotationStatus);
-            if (intAnnotationStatus < 4 && intAnnotationStatus >= 0) {
-                task.setFileAnnotationStatus(annotationStatus);
-            } else {
-                task.setFileAnnotationStatus("5");
+
+            if ("1".equals(annotationStatus)) {
+                //已标注文件列表
+                task.setFileAnnotationStatus("1");
+            }else if ("2".equals(annotationStatus)){
+                //未标注文件列表
+                task.setFileAnnotationStatus("0");
+            }else if ("3".equals(annotationStatus)){
+                //审核驳回
+                task.setFileAnnotationStatus("3");
             }
             return annotationTaskMapper.getTaskBasicFile(task);
         }catch(Exception e){
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 fecfc68..417cd94 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
+++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
@@ -263,7 +263,7 @@
         <if test="reviewerId != null and reviewerId != ''">
             AND atap.reviewer_id = #{reviewerId}
         </if>
-        <if test="fileAnnotationStatus != null and fileAnnotationStatus != '5'">
+        <if test="fileAnnotationStatus != null and fileAnnotationStatus != ''  and fileAnnotationStatus != '5'">
             AND atap.annotation_status = #{fileAnnotationStatus}
         </if>
     </select>