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 d8edf51..86f761e 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 @@ -55,12 +55,13 @@ public class AnnotationTaskEntity extends BaseEntity { private List subAnnotationTasks; /**用于查询目的*/ - /**根据任务id,标注人id或审核人id 和文件标注状态返回满足条件的文件列表*/ +// /**根据任务id,标注人id或审核人id 和文件标注状态返回满足条件的文件列表*/ private String annotatorId= ""; private String reviewerId = ""; - private String fileAnnotationStatus; - /**根据任务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 2a99a58..dd9b2be 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(AnnotationTaskEntity annotationTask); + ListgetTaskBasicFile(AnnotationTaskAnnotatorEntity annotationTask); /**根据任务Id,文件id返回审核驳回的原因*/ - String getAuditFailReasonByFileId(Long taskId, Long fileId); + String getAuditFailReasonByFileId(AnnotationTaskAnnotatorEntity 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 31a0b4a..211e1b6 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 @@ -211,17 +211,16 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService { @Override public List getMyAnnotaionTaskBasicFile(Long taskId, String annotationStatus){ try { - String userId = SecurityUtils.getUserId().toString(); - AnnotationTaskEntity task = new AnnotationTaskEntity(); + Long userId = SecurityUtils.getUserId(); + AnnotationTaskAnnotatorEntity task = new AnnotationTaskAnnotatorEntity(); task.setTaskId(taskId); task.setAnnotatorId(userId); Long intAnnotationStatus = Long.valueOf(annotationStatus); if (intAnnotationStatus < 4 && intAnnotationStatus >= 0) { - task.setFileAnnotationStatus(annotationStatus); + task.setAnnotationStatus(annotationStatus); } else { - task.setFileAnnotationStatus("5"); + task.setAnnotationStatus("5"); } - task.setFileAnnotationStatus(annotationStatus); return annotationTaskMapper.getTaskBasicFile(task); }catch(Exception e){ e.printStackTrace(); @@ -231,16 +230,16 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService { @Override public List getMyAuditTaskBasicFile(Long taskId, String annotationStatus){ - String userId = SecurityUtils.getUserId().toString(); - AnnotationTaskEntity task = new AnnotationTaskEntity(); + Long userId = SecurityUtils.getUserId(); + AnnotationTaskAnnotatorEntity task = new AnnotationTaskAnnotatorEntity(); task.setTaskId(taskId); task.setReviewerId(userId); Long intAnnotationStatus = Long.valueOf(annotationStatus); if (intAnnotationStatus <4 && intAnnotationStatus >= 0) { - task.setFileAnnotationStatus(annotationStatus); + task.setAnnotationStatus(annotationStatus); } else { - task.setFileAnnotationStatus("5"); + task.setAnnotationStatus("5"); } return annotationTaskMapper.getTaskBasicFile(task); } @@ -249,7 +248,10 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService { @Override public String getAuditFailReasonByFileId(Long taskId, Long fileId){ try { - return annotationTaskMapper.getAuditFailReasonByFileId(taskId, fileId); + AnnotationTaskAnnotatorEntity task = new AnnotationTaskAnnotatorEntity(); + task.setTaskId(taskId); + task.setFileId(fileId); + return annotationTaskMapper.getAuditFailReasonByFileId(task); }catch(Exception e){ e.printStackTrace(); return ""; 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..63fa596 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 = #{fileAnnotationStatus} + AND atap.annotation_status = #{annotationStatus} - SELECT atap.audit_failed_reason FROM ai_basic_file abf