라벨링작업 관리 목록조회 수정
This commit is contained in:
@@ -116,10 +116,7 @@ public class LabelAllocateService {
|
|||||||
* @return 작업자 목록 및 통계
|
* @return 작업자 목록 및 통계
|
||||||
*/
|
*/
|
||||||
public WorkerListResponse getWorkerStatistics(
|
public WorkerListResponse getWorkerStatistics(
|
||||||
Long analUid,
|
Long analUid, String workerType, String search, String sortType) {
|
||||||
String workerType,
|
|
||||||
String search,
|
|
||||||
String sortType) {
|
|
||||||
|
|
||||||
// 프로젝트 정보 조회 (analUid가 있을 때만)
|
// 프로젝트 정보 조회 (analUid가 있을 때만)
|
||||||
var projectInfo = labelAllocateCoreService.findProjectInfo(analUid);
|
var projectInfo = labelAllocateCoreService.findProjectInfo(analUid);
|
||||||
@@ -127,10 +124,7 @@ public class LabelAllocateService {
|
|||||||
// 작업 진행 현황 조회
|
// 작업 진행 현황 조회
|
||||||
var progressInfo = labelAllocateCoreService.findWorkProgressInfo(analUid);
|
var progressInfo = labelAllocateCoreService.findWorkProgressInfo(analUid);
|
||||||
|
|
||||||
return WorkerListResponse.builder()
|
return WorkerListResponse.builder().projectInfo(projectInfo).progressInfo(progressInfo).build();
|
||||||
.projectInfo(projectInfo)
|
|
||||||
.progressInfo(progressInfo)
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public InferenceDetail findInferenceDetail(String uuid) {
|
public InferenceDetail findInferenceDetail(String uuid) {
|
||||||
|
|||||||
@@ -314,18 +314,19 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
|
|||||||
.fetchOne();
|
.fetchOne();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Long total =
|
Long totalCnt =
|
||||||
|
(long)
|
||||||
queryFactory
|
queryFactory
|
||||||
.select(mapSheetAnalInferenceEntity.uuid.countDistinct())
|
.select(memberEntity.userRole, memberEntity.name, memberEntity.userId)
|
||||||
.from(mapSheetAnalInferenceEntity)
|
.from(labelingAssignmentEntity)
|
||||||
.innerJoin(mapSheetAnalDataInferenceEntity)
|
.innerJoin(memberEntity)
|
||||||
.on(whereSubDataBuilder)
|
|
||||||
.innerJoin(mapSheetAnalDataInferenceGeomEntity)
|
|
||||||
.on(whereSubBuilder)
|
.on(whereSubBuilder)
|
||||||
.where(whereBuilder)
|
.where(whereBuilder)
|
||||||
.fetchOne();
|
.groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId)
|
||||||
|
.fetch()
|
||||||
|
.size();
|
||||||
|
|
||||||
return new PageImpl<>(foundContent, pageable, total);
|
return new PageImpl<>(foundContent, pageable, totalCnt);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user