diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java index 823b02e5..2ec2c131 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java @@ -306,6 +306,10 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport queryFactory .select(labelingAssignmentEntity.count()) .from(labelingAssignmentEntity) + .innerJoin(mapSheetAnalInferenceEntity) + .on( + labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), + mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId())) .where(labelingAssignmentEntity.workerUid.eq(userId)) .fetchOne(); @@ -326,6 +330,10 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport queryFactory .select(labelingAssignmentEntity.count()) .from(labelingAssignmentEntity) + .innerJoin(mapSheetAnalInferenceEntity) + .on( + labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), + mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId())) .where( labelingAssignmentEntity.workerUid.eq(userId), labelingAssignmentEntity.workState.eq("ASSIGNED")) @@ -354,6 +362,10 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport queryFactory .select(labelingAssignmentEntity.count()) .from(labelingAssignmentEntity) + .innerJoin(mapSheetAnalInferenceEntity) + .on( + labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), + mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId())) .where( labelingAssignmentEntity.workerUid.eq(userId), labelingAssignmentEntity.workState.in( diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java index 23b43d3a..794fa8b1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java @@ -314,6 +314,10 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport queryFactory .select(labelingAssignmentEntity.count()) .from(labelingAssignmentEntity) + .innerJoin(mapSheetAnalInferenceEntity) + .on( + labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), + mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId())) .where(labelingAssignmentEntity.inspectorUid.eq(userId)) .fetchOne(); @@ -334,6 +338,10 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport queryFactory .select(labelingAssignmentEntity.count()) .from(labelingAssignmentEntity) + .innerJoin(mapSheetAnalInferenceEntity) + .on( + labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), + mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId())) .where( labelingAssignmentEntity.inspectorUid.eq(userId), labelingAssignmentEntity.inspectState.eq("UNCONFIRM")) @@ -362,6 +370,10 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport queryFactory .select(labelingAssignmentEntity.count()) .from(labelingAssignmentEntity) + .innerJoin(mapSheetAnalInferenceEntity) + .on( + labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), + mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId())) .where( labelingAssignmentEntity.inspectorUid.eq(userId), labelingAssignmentEntity.inspectState.in("COMPLETE", "EXCEPT"),