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 3b033c1..b1c13e3 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 @@ -71,6 +71,8 @@ public class AnnotationTaskEntity extends BaseEntity { private int status3Count; /**总数*/ private int totalCount; + /**最新版本数*/ + private String lastVersionName; diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/ReleaseVersionEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/ReleaseVersionEntity.java index 43b2794..2c578a7 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/ReleaseVersionEntity.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/ReleaseVersionEntity.java @@ -36,6 +36,8 @@ public class ReleaseVersionEntity extends BaseEntity { String annotationType; Long auditedCount; Long totalCount; + //版本发布人名 + String releaseUserName; public static class AnnotationResult{ 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 407d843..e9b4824 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml @@ -83,11 +83,21 @@ SUM(CASE WHEN ap.annotation_status = '1' THEN 1 ELSE 0 END) AS status1Count, SUM(CASE WHEN ap.annotation_status = '2' THEN 1 ELSE 0 END) AS status2Count, SUM(CASE WHEN ap.annotation_status = '3' THEN 1 ELSE 0 END) AS status3Count, - COUNT(*) AS totalCount + COUNT(*) AS totalCount, + atv.version_name as lastVersionName FROM ai_annotation_task at left join ai_annotation_task_annotator_map ap on at.task_id = ap.task_id LEFT join ai_dataset ad on ad.dataset_id = at.dataset_id LEFT join sys_user su on su.user_id = at.create_by + LEFT JOIN ( + SELECT task_id, dataset_id, version_name + FROM ai_dataset_version + WHERE (task_id, dataset_id, create_time) IN ( + SELECT task_id, dataset_id, MAX(create_time) + FROM ai_dataset_version + GROUP BY task_id, dataset_id + ) + ) atv ON atv.task_id = at.task_id AND atv.dataset_id = at.dataset_id WHERE at.del_flag = '0' and ap.annotation_status IN ('0', '1', '2','3') AND at.task_name LIKE CONCAT('%', #{taskName}, '%') diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/ReleaseVersionMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/ReleaseVersionMapper.xml index 7ec9490..a8a15eb 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/ReleaseVersionMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/ReleaseVersionMapper.xml @@ -24,12 +24,14 @@ aat.task_name as taskName, ad.dataset_name as datasetName, aat.annotation_type as annotationType, + su.user_name AS releaseUserName, SUM(CASE WHEN ap.annotation_status = '2' or ap.annotation_status = '3' THEN 1 ELSE 0 END) AS auditedCount, COUNT(*) AS totalCount from ai_dataset_version atv left join ai_annotation_task aat on aat.task_id = atv.task_id left join ai_dataset ad on ad.dataset_id = atv.dataset_id left join ai_annotation_task_annotator_map ap on atv.task_id = ap.task_id + left join sys_user su ON su.user_id = atv.create_by where atv.del_flag = '0' and ap.annotation_status IN ('0', '1', '2','3') and atv.dataset_id =#{datasetId} AND version_name LIKE CONCAT('%', #{versionName}, '%')