라벨 이관 로직 수정
This commit is contained in:
@@ -197,11 +197,11 @@ public class LabelAllocateApiController {
|
||||
|
||||
return ApiResponseDto.okObject(
|
||||
labelAllocateService.allocateMove(
|
||||
dto.getAutoType(),
|
||||
dto.getStage(),
|
||||
dto.getLabelers(),
|
||||
dto.getCompareYyyy(),
|
||||
dto.getTargetYyyy()));
|
||||
dto.getTargetYyyy(),
|
||||
dto.getUserId()));
|
||||
}
|
||||
|
||||
@Operation(
|
||||
|
||||
@@ -225,14 +225,11 @@ public class LabelAllocateDto {
|
||||
@AllArgsConstructor
|
||||
public static class AllocateMoveDto {
|
||||
|
||||
@Schema(description = "자동/수동여부(AUTO/MANUAL)", example = "AUTO")
|
||||
private String autoType;
|
||||
|
||||
@Schema(description = "회차", example = "4")
|
||||
private Integer stage;
|
||||
|
||||
@Schema(
|
||||
description = "라벨러 할당 목록",
|
||||
description = "이관할 라벨러 할당량",
|
||||
example =
|
||||
"""
|
||||
[
|
||||
@@ -253,6 +250,9 @@ public class LabelAllocateDto {
|
||||
|
||||
@Schema(description = "기준년도", example = "2024")
|
||||
private Integer targetYyyy;
|
||||
|
||||
@Schema(description = "대상 사번", example = "01022223333")
|
||||
private String userId;
|
||||
}
|
||||
|
||||
@Getter
|
||||
|
||||
@@ -132,11 +132,11 @@ public class LabelAllocateService {
|
||||
}
|
||||
|
||||
public ApiResponseDto.ResponseObj allocateMove(
|
||||
String autoType,
|
||||
Integer stage,
|
||||
List<TargetUser> targetUsers,
|
||||
Integer compareYyyy,
|
||||
Integer targetYyyy) {
|
||||
Integer targetYyyy,
|
||||
String userId) {
|
||||
Long lastId = null;
|
||||
|
||||
Long chargeCnt = targetUsers.stream().mapToLong(TargetUser::getDemand).sum();
|
||||
@@ -147,7 +147,7 @@ public class LabelAllocateService {
|
||||
|
||||
List<Long> allIds =
|
||||
labelAllocateCoreService.fetchNextMoveIds(
|
||||
lastId, chargeCnt, compareYyyy, targetYyyy, stage);
|
||||
lastId, chargeCnt, compareYyyy, targetYyyy, stage, userId);
|
||||
int index = 0;
|
||||
for (TargetUser target : targetUsers) {
|
||||
int end = index + target.getDemand();
|
||||
|
||||
Reference in New Issue
Block a user