Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java
This commit is contained in:
Moon
2026-01-05 15:16:59 +09:00

View File

@@ -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) {