MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java
#	src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
This commit is contained in:
DanielLee
2026-01-05 13:37:44 +09:00
parent 462cdc0241 6d2d21b221
commit af8d8c235c
15 changed files with 830 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java
View File

@@ -92,13 +92,20 @@ public class LabelAllocateApiController {
},
defaultValue = "NAME_ASC"))
@RequestParam(required = false)
String sort) {
String sort,
@Parameter(description = "페이지 번호 (0부터 시작)", example = "0")
@RequestParam(defaultValue = "0")
Integer page,
@Parameter(description = "페이지 크기", example = "20")
@RequestParam(defaultValue = "20")
Integer size) {
// type이 null이면 기본값으로 LABELER 설정
String workerType = (type == null || type.isEmpty()) ? RoleType.LABELER.name() : type;
return ApiResponseDto.ok(
labelAllocateService.getWorkerStatistics(null, workerType, search, sort));
labelAllocateService.getWorkerStatistics(
null, workerType, search, sort, page, size));
}
@Operation(summary = "라벨링작업 관리 > 작업 배정", description = "라벨링작업 관리 > 작업 배정")