From 76dca8583874e56ec598e532f4404ebe5ec02756 Mon Sep 17 00:00:00 2001
From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com>
Date: Fri, 29 Nov 2024 18:12:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=87=E6=B3=A8=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/ai/domain/DataSetBasicFileEntity.java  | 1 +
 .../java/com/bonus/ai/mapper/AnnotationTaskMapper.java    | 4 ++++
 .../service/Impl/dataset/AnnotationTaskServiceImpl.java   | 8 ++++++++
 .../bonus/ai/service/dataset/AnnotationTaskService.java   | 4 ++++
 .../src/main/resources/mapper/AnnotationTaskMapper.xml    | 3 ++-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetBasicFileEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetBasicFileEntity.java
index 5e1ad9e..e21c1e0 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetBasicFileEntity.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetBasicFileEntity.java
@@ -72,4 +72,5 @@ public class DataSetBasicFileEntity extends BaseEntity {
 
     /**查询目的，表示文件在当前任务下的标注状态*/
     String fileAnnotationStatus;
+    String annotationResult;
 }
diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/AnnotationTaskMapper.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/AnnotationTaskMapper.java
index df14ce1..34c4b85 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/AnnotationTaskMapper.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/AnnotationTaskMapper.java
@@ -63,11 +63,15 @@ public interface AnnotationTaskMapper
     /**更新标注文件信息，如标注结果和审核驳回原因*/
     int updateAnnotationInfo(AnnotationTaskAnnotatorEntity entity);
 
+    /**根据taskid ，fileid获取标注详情*/
+    List<AnnotationTaskAnnotatorEntity> selectAnnotationDetailByTaskFile(AnnotationTaskAnnotatorEntity subTask);
+
     /**根据文件标注状态，标注人或审核人等信息 返回任务关联的文件详情*/
     List<DataSetBasicFileEntity>getTaskBasicFile(AnnotationTaskEntity annotationTask);
     /**根据任务Id，文件id返回审核驳回的原因*/
     String getAuditFailReasonByFileId(AnnotationTaskEntity annotationTask);
 
+
     //这个接口不需要，可以扩展selectAnnotationTaskList
 //    AnnotationTaskEntity selectAnnotationTaskListUUID(Long taskId);
 
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 ee6cf3c..449cbf9 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
@@ -286,6 +286,14 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService {
 
     }
 
+
+    /**根据taskid 或fileid获取标注详情*/
+    @Override
+    public List<AnnotationTaskAnnotatorEntity> selectAnnotationDetailByTaskFile(AnnotationTaskAnnotatorEntity subTask){
+        return annotationTaskMapper.selectAnnotationDetailByTaskFile(subTask);
+    }
+
+
     @Override
     public int audit(AnnotationTaskAnnotatorEntity subTask){
         try {
diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/dataset/AnnotationTaskService.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/dataset/AnnotationTaskService.java
index 46462df..5fcdf8b 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/dataset/AnnotationTaskService.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/dataset/AnnotationTaskService.java
@@ -23,6 +23,10 @@ public interface AnnotationTaskService {
     /**手工标注*/
     int manualAnnotate(AnnotationTaskAnnotatorEntity subTask);
 
+//    /**根据taskid 或fileid获取标注详情*/
+    List<AnnotationTaskAnnotatorEntity> selectAnnotationDetailByTaskFile(AnnotationTaskAnnotatorEntity subTask);
+
+
     /**手工审核*/
     int audit(AnnotationTaskAnnotatorEntity subTask);
 
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 a16bdb8..4fa1b68 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
+++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
@@ -248,7 +248,8 @@
         abf.file_size AS fileSize,
         abf.file_url AS fileUrl,
         adfm.create_time AS createTime,
-        atap.annotation_status AS annotationStatus
+        atap.annotation_status AS fileAnnotationStatus,
+        atap.annotation_result AS annotationResult
         FROM ai_basic_file abf
         LEFT JOIN ai_dataset_file_map adfm ON abf.file_id = adfm.file_id
         LEFT JOIN ai_annotation_task aat ON aat.dataset_id= adfm.dataset_id