Merge pull request 'merge 할 때 누락된 내용 추가 커밋' (#138) from feat/dev_251201 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/138

src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java

@@ -5,6 +5,7 @@ import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse;
 import com.kamco.cd.kamcoback.label.service.LabelAllocateService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -18,6 +19,7 @@ import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -147,18 +149,24 @@ public class LabelAllocateApiController {
   }
 
   @Operation(
-      summary = "작업현황 관리 > 라벨러 상세 정보, 작업이관 팝업 내 라벨러 상세 정보 동일",
+      summary = "작업현황 관리 > 라벨러/검수자 상세 정보, 작업이관 팝업 내 라벨러 상세 정보 동일",
-      description = "작업현황 관리 > 라벨러 상세 정보, 작업이관 팝업 내 라벨러 상세 정보 동일")
+      description = "작업현황 관리 > 라벨러/검수자 상세 정보, 작업이관 팝업 내 라벨러 상세 정보 동일")
-  @GetMapping("/labeler-detail")
+  @GetMapping("/user-detail")
-  public ApiResponseDto<LabelerDetail> findLabelerDetail(
+  public ApiResponseDto<LabelerDetail> findUserDetail(
       @RequestParam(defaultValue = "01022223333", required = true) String userId,
       @Parameter(
               description = "회차 마스터 key",
               required = true,
               example = "8584e8d4-53b3-4582-bde2-28a81495a626")
           @RequestParam
-          String uuid) {
+          String uuid,
-    return ApiResponseDto.ok(labelAllocateService.findLabelerDetail(userId, uuid));
+      @Schema(
+              allowableValues = {"LABELER", "REVIEWER"},
+              defaultValue = "LABELER")
+          @Parameter(description = "라벨러/검수자(LABELER/REVIEWER)", required = true)
+          @RequestParam
+          String type) {
+    return ApiResponseDto.ok(labelAllocateService.findUserDetail(userId, uuid, type));
   }
 
   @Operation(summary = "작업현황 관리 > 상세 > 작업 이관", description = "작업현황 관리 > 상세 > 작업 이관")
@@ -195,4 +203,29 @@ public class LabelAllocateApiController {
             dto.getCompareYyyy(),
             dto.getTargetYyyy()));
   }
+
+  @Operation(
+      summary = "라벨링작업 관리 > 상세 > 라벨러/검수자 일별 작업량 목록",
+      description = "라벨링작업 관리 > 상세 > 라벨러/검수자 일별 작업량 목록")
+  @GetMapping("/daily-list")
+  public ApiResponseDto<Page<LabelingStatDto>> findDaliyList(
+      @RequestParam(defaultValue = "0", required = true) int page,
+      @RequestParam(defaultValue = "20", required = true) int size,
+      @Parameter(
+              description = "회차 마스터 key",
+              required = true,
+              example = "8584e8d4-53b3-4582-bde2-28a81495a626")
+          @RequestParam
+          String uuid,
+      @Parameter(description = "사번", required = true, example = "123456") @RequestParam
+          String userId,
+      @Schema(
+              allowableValues = {"LABELER", "REVIEWER"},
+              defaultValue = "LABELER")
+          @Parameter(description = "라벨러/검수자(LABELER/REVIEWER)", required = true)
+          @RequestParam
+          String type) {
+    LabelAllocateDto.searchReq searchReq = new LabelAllocateDto.searchReq(page, size, "");
+    return ApiResponseDto.ok(labelAllocateService.findDaliyList(searchReq, uuid, userId, type));
+  }
 }

src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java

@@ -6,6 +6,7 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.TargetUser;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse;
@@ -13,6 +14,7 @@ import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
 import java.util.List;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -158,7 +160,20 @@ public class LabelAllocateService {
     return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "이관을 완료하였습니다.");
   }
 
-  public LabelerDetail findLabelerDetail(String userId, String uuid) {
+  public LabelerDetail findUserDetail(String userId, String uuid, String type) {
+    if (type.equals("LABELER")) {
       return labelAllocateCoreService.findLabelerDetail(userId, uuid);
+    } else {
+      return labelAllocateCoreService.findInspectorDetail(userId, uuid);
+    }
+  }
+
+  public Page<LabelingStatDto> findDaliyList(
+      LabelAllocateDto.searchReq searchReq, String uuid, String userId, String type) {
+    if (type.equals("LABELER")) {
+      return labelAllocateCoreService.findLabelerDailyStat(searchReq, uuid, userId);
+    } else {
+      return labelAllocateCoreService.findInspectorDailyStat(searchReq, uuid, userId);
+    }
   }
 }