From 01a86c313a25bc7a0bedd6f278a2f80075513ce5 Mon Sep 17 00:00:00 2001 From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com> Date: Thu, 28 Nov 2024 11:33:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=B8=8A=E6=AC=A1=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dataset/AnnotationTaskEntity.java | 8 ++++---- .../bonus/ai/mapper/AnnotationTaskMapper.java | 4 ++-- .../dataset/AnnotationTaskServiceImpl.java | 18 +++++++++--------- .../resources/mapper/AnnotationTaskMapper.xml | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java index 86f761e..1fe4cd3 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java @@ -58,10 +58,10 @@ public class AnnotationTaskEntity extends BaseEntity { // /**根据任务id，标注人id或审核人id 和文件标注状态返回满足条件的文件列表*/ private String annotatorId= ""; private String reviewerId = ""; -// private String fileAnnotationStatus; -// private String fileName; -// /**根据任务id 和文件id 返回审核驳回的原因*/ -// private Long fileId = 0L; + private String fileAnnotationStatus; + private String fileName; + /**根据任务id 和文件id 返回审核驳回的原因*/ + private Long fileId = 0L; /**任务查询数据*/ private String datasetName; private String ownerName; 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 dd9b2be..df14ce1 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 @@ -64,9 +64,9 @@ public interface AnnotationTaskMapper int updateAnnotationInfo(AnnotationTaskAnnotatorEntity entity); /**根据文件标注状态，标注人或审核人等信息 返回任务关联的文件详情*/ - ListgetTaskBasicFile(AnnotationTaskAnnotatorEntity annotationTask); + ListgetTaskBasicFile(AnnotationTaskEntity annotationTask); /**根据任务Id，文件id返回审核驳回的原因*/ - String getAuditFailReasonByFileId(AnnotationTaskAnnotatorEntity annotationTask); + 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 211e1b6..b453252 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 @@ -212,14 +212,14 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService { public List getMyAnnotaionTaskBasicFile(Long taskId, String annotationStatus){ try { Long userId = SecurityUtils.getUserId(); - AnnotationTaskAnnotatorEntity task = new AnnotationTaskAnnotatorEntity(); + AnnotationTaskEntity task = new AnnotationTaskEntity(); task.setTaskId(taskId); - task.setAnnotatorId(userId); + task.setAnnotatorId(String.valueOf(userId)); Long intAnnotationStatus = Long.valueOf(annotationStatus); if (intAnnotationStatus < 4 && intAnnotationStatus >= 0) { - task.setAnnotationStatus(annotationStatus); + task.setFileAnnotationStatus(annotationStatus); } else { - task.setAnnotationStatus("5"); + task.setFileAnnotationStatus("5"); } return annotationTaskMapper.getTaskBasicFile(task); }catch(Exception e){ @@ -231,15 +231,15 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService { @Override public List getMyAuditTaskBasicFile(Long taskId, String annotationStatus){ Long userId = SecurityUtils.getUserId(); - AnnotationTaskAnnotatorEntity task = new AnnotationTaskAnnotatorEntity(); + AnnotationTaskEntity task = new AnnotationTaskEntity(); task.setTaskId(taskId); - task.setReviewerId(userId); + task.setReviewerId(String.valueOf(userId)); Long intAnnotationStatus = Long.valueOf(annotationStatus); if (intAnnotationStatus <4 && intAnnotationStatus >= 0) { - task.setAnnotationStatus(annotationStatus); + task.setFileAnnotationStatus(annotationStatus); } else { - task.setAnnotationStatus("5"); + task.setFileAnnotationStatus("5"); } return annotationTaskMapper.getTaskBasicFile(task); } @@ -248,7 +248,7 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService { @Override public String getAuditFailReasonByFileId(Long taskId, Long fileId){ try { - AnnotationTaskAnnotatorEntity task = new AnnotationTaskAnnotatorEntity(); + AnnotationTaskEntity task = new AnnotationTaskEntity(); task.setTaskId(taskId); task.setFileId(fileId); return annotationTaskMapper.getAuditFailReasonByFileId(task); 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 63fa596..fecfc68 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml @@ -241,7 +241,7 @@ - SELECT distinct adfm.file_id AS fileId, abf.file_name AS fileName, @@ -264,12 +264,12 @@ AND atap.reviewer_id = #{reviewerId} - AND atap.annotation_status = #{annotationStatus} + AND atap.annotation_status = #{fileAnnotationStatus} - SELECT atap.audit_failed_reason FROM ai_basic_file abf