라벨링작업 관리 목록조회 수정

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

@@ -8,7 +8,6 @@ import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngSearchReq;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerStateSearchReq;
-import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.label.service.LabelWorkService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -108,25 +107,27 @@ public class LabelWorkerApiController {
 
   @Operation(summary = "작업현황 관리 > 현황 목록 조회", description = "작업현황 관리 > 현황 목록 조회")
   @ApiResponses(
-    value = {
+      value = {
-      @ApiResponse(
+        @ApiResponse(
-        responseCode = "200",
+            responseCode = "200",
-        description = "조회 성공",
+            description = "조회 성공",
-        content =
+            content =
-        @Content(
+                @Content(
-          mediaType = "application/json",
+                    mediaType = "application/json",
-          schema = @Schema(implementation = CommonCodeDto.Basic.class))),
+                    schema = @Schema(implementation = Page.class))),
-      @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
-      @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-    })
+      })
   @GetMapping("/work-state-list")
   public ApiResponseDto<Page<WorkerState>> findWorkStateList(
-    @Parameter(description = "유형", example = "LABELER") @RequestParam(required = false) String userRole,
+      @Parameter(description = "유형", example = "LABELER") @RequestParam(required = false)
-    @Parameter(description = "검색어", example = "20261201") @RequestParam(required = false) String searchVal,
+          String userRole,
-    @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
+      @Parameter(description = "검색어", example = "20261201") @RequestParam(required = false)
-    int page,
+          String searchVal,
-    @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
+      @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
-    int size) {
+          int page,
+      @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
+          int size) {
 
     LabelWorkDto.WorkerStateSearchReq searchReq = new WorkerStateSearchReq();
     searchReq.setUserRole(userRole);

src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.kamco.cd.kamcoback.common.utils.enums.Enums;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
-import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.DailyHistory;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.ZonedDateTime;
 import java.util.UUID;
@@ -130,7 +129,6 @@ public class LabelWorkDto {
     }
   }
 
-
   @Getter
   @Setter
   @Builder
@@ -167,7 +165,7 @@ public class LabelWorkDto {
     private Long day1AgoDoneCnt;
 
     public Long getremindCnt() {
-           return this.assignedCnt - this.doneCnt;
+      return this.assignedCnt - this.doneCnt;
     }
 
     public double getDoneRate() {
@@ -183,7 +181,6 @@ public class LabelWorkDto {
       }
       return "검수자";
     }
-
   }
 
   @Schema(name = "WorkerStateSearchReq", description = "라벨작업관리 검색 요청")

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

@@ -8,7 +8,6 @@ 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.TargetUser;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
-import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.DailyHistory;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
@@ -122,12 +121,7 @@ public class LabelAllocateService {
    * @return 작업자 목록 및 통계
    */
   public WorkerListResponse getWorkerStatistics(
-      Long analUid,
+      Long analUid, String workerType, String search, String sortType, Integer page, Integer size) {
-      String workerType,
-      String search,
-      String sortType,
-      Integer page,
-      Integer size) {
 
     // 프로젝트 정보 조회 (analUid가 있을 때만)
     var projectInfo = labelAllocateCoreService.findProjectInfo(analUid);
@@ -135,12 +129,9 @@ public class LabelAllocateService {
     // 작업 진행 현황 조회
     var progressInfo = labelAllocateCoreService.findWorkProgressInfo(analUid);
 
-
-
     // 작업자 통계 조회
     List<WorkerStatistics> workers =
-        labelAllocateCoreService.findWorkerStatistics(
+        labelAllocateCoreService.findWorkerStatistics(analUid, workerType, search, sortType);
-            analUid, workerType, search, sortType);
 
     // 각 작업자별 3일치 처리량 조회
     LocalDate today = LocalDate.now();
@@ -156,10 +147,6 @@ public class LabelAllocateService {
               worker.getWorkerId(), workerType, today.minusDays(3), analUid);
 
       long average = (day1Count + day2Count + day3Count) / 3;
-
-
-
-
     }
 
     // 페이징 처리

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

@@ -3,9 +3,8 @@ package com.kamco.cd.kamcoback.label.service;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.ChangeDetectYear;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
-import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState;
-import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
+import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState;
 import com.kamco.cd.kamcoback.postgres.core.LabelWorkCoreService;
 import java.util.List;
 import java.util.UUID;
@@ -52,7 +51,6 @@ public class LabelWorkService {
     return labelWorkCoreService.getChangeDetectYear();
   }
 
-
   public Page<WorkerState> findlabelWorkStateList(LabelWorkDto.WorkerStateSearchReq searchReq) {
 
     return labelWorkCoreService.findlabelWorkStateList(searchReq);

src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelWorkCoreService.java

@@ -1,10 +1,13 @@
 package com.kamco.cd.kamcoback.postgres.core;
 
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
+import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.ChangeDetectYear;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
+import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState;
-import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.postgres.repository.label.LabelWorkRepository;
+import java.util.List;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -40,10 +43,10 @@ public class LabelWorkCoreService {
     return labelWorkRepository.labelWorkMngList(searchReq);
   }
 
-  public Page<WorkerState> findlabelWorkStateList(LabelWorkDto.WorkerStateSearchReq searchReq)
+  public Page<WorkerState> findlabelWorkStateList(LabelWorkDto.WorkerStateSearchReq searchReq) {
-  {
     return labelWorkRepository.findlabelWorkStateList(searchReq);
-  };
+  }
+  ;
 
   /**
    * 작업배정 정보 조회

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryCustom.java

@@ -2,9 +2,8 @@ package com.kamco.cd.kamcoback.postgres.repository.label;
 
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
-import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState;
-import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
+import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity;
 import java.util.List;
 import java.util.UUID;
@@ -19,5 +18,4 @@ public interface LabelWorkRepositoryCustom {
   LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid);
 
   Page<WorkerState> findlabelWorkStateList(LabelWorkDto.WorkerStateSearchReq searchReq);
-
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java

@@ -1,21 +1,15 @@
 package com.kamco.cd.kamcoback.postgres.repository.label;
 
 import static com.kamco.cd.kamcoback.postgres.entity.QLabelingAssignmentEntity.labelingAssignmentEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QLabelingAssignmentEntity.labelingAssignmentEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QMapInkx5kEntity.mapInkx5kEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity.mapSheetAnalDataInferenceEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngEntity.mapSheetMngEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngHstEntity.mapSheetMngHstEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity;
 
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState;
-import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
-import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataGeomEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity;
 import com.querydsl.core.BooleanBuilder;
@@ -196,22 +190,21 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
      */
 
     Long total =
-      queryFactory
+        queryFactory
-        .select(mapSheetAnalInferenceEntity.uuid.countDistinct())
+            .select(mapSheetAnalInferenceEntity.uuid.countDistinct())
-        .from(mapSheetAnalInferenceEntity)
+            .from(mapSheetAnalInferenceEntity)
-        .innerJoin(mapSheetAnalDataInferenceEntity)
+            .innerJoin(mapSheetAnalDataInferenceEntity)
-        .on(whereSubDataBuilder)
+            .on(whereSubDataBuilder)
-        .innerJoin(mapSheetAnalDataInferenceGeomEntity)
+            .innerJoin(mapSheetAnalDataInferenceGeomEntity)
-        .on(whereSubBuilder)
+            .on(whereSubBuilder)
-        .where(whereBuilder)
+            .where(whereBuilder)
-        .fetchOne();
+            .fetchOne();
 
     return new PageImpl<>(foundContent, pageable, total);
   }
 
-
   @Override
-  public Page<WorkerState> findlabelWorkStateList(LabelWorkDto.WorkerStateSearchReq searchReq){
+  public Page<WorkerState> findlabelWorkStateList(LabelWorkDto.WorkerStateSearchReq searchReq) {
     Pageable pageable = PageRequest.of(searchReq.getPage(), searchReq.getSize());
     BooleanBuilder whereBuilder = new BooleanBuilder();
     BooleanBuilder whereSubBuilder = new BooleanBuilder();
@@ -225,89 +218,92 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
     LocalDate oneDaysAgo = LocalDate.now().minusDays(1);
     String s1 = oneDaysAgo.format(DateTimeFormatter.ofPattern("YYYY-MM-DD"));
 
-    if (searchReq.getUserRole() != null && ! searchReq.getUserRole().isEmpty()) {
+    if (searchReq.getUserRole() != null && !searchReq.getUserRole().isEmpty()) {
       whereSubBuilder.and(memberEntity.userRole.eq(searchReq.getUserRole()));
     }
 
-    if (searchReq.getSearchVal() != null && ! searchReq.getSearchVal().isEmpty()) {
+    if (searchReq.getSearchVal() != null && !searchReq.getSearchVal().isEmpty()) {
       whereSubBuilder.and(
-        Expressions.stringTemplate(
+          Expressions.stringTemplate("{0}", memberEntity.userId)
-            "{0}",memberEntity.userId)
-          .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
-          .or(
-            Expressions.stringTemplate(
-                "{0}",memberEntity.name)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
-          )
+              .or(
-      );
+                  Expressions.stringTemplate("{0}", memberEntity.name)
+                      .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(
+    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.userId));
-      labelingAssignmentEntity.workerUid.eq(memberEntity.userId));
 
     List<WorkerState> foundContent =
-      queryFactory
+        queryFactory
-        .select(
+            .select(
-          Projections.constructor(
+                Projections.constructor(
-            WorkerState.class,
+                    WorkerState.class,
-            memberEntity.userRole,
+                    memberEntity.userRole,
-            memberEntity.name,
+                    memberEntity.name,
-            memberEntity.userId,
+                    memberEntity.userId,
-            labelingAssignmentEntity.workerUid.count().as("assignedCnt"),
+                    labelingAssignmentEntity.workerUid.count().as("assignedCnt"),
-            new CaseBuilder()
+                    new CaseBuilder()
-              .when(labelingAssignmentEntity.workState.eq("DONE"))
+                        .when(labelingAssignmentEntity.workState.eq("DONE"))
-              .then(1L)
+                        .then(1L)
-              .otherwise(0L)
+                        .otherwise(0L)
-              .sum()
+                        .sum()
-              .as("doneCnt"),
+                        .as("doneCnt"),
-            new CaseBuilder()
+                    new CaseBuilder()
-              .when(labelingAssignmentEntity.workState.eq("SKIP"))
+                        .when(labelingAssignmentEntity.workState.eq("SKIP"))
-              .then(1L)
+                        .then(1L)
-              .otherwise(0L)
+                        .otherwise(0L)
-              .sum()
+                        .sum()
-              .as("skipCnt"),
+                        .as("skipCnt"),
-            new CaseBuilder()
+                    new CaseBuilder()
-              .when(labelingAssignmentEntity.workState.eq("DONE")
+                        .when(
-                .and(
+                            labelingAssignmentEntity
-                  Expressions.stringTemplate(
+                                .workState
-                      "to_char({0}, 'YYYY-MM-DD')", labelingAssignmentEntity.modifiedDate).eq(s3)                )
+                                .eq("DONE")
-              )
+                                .and(
-              .then(1L)
+                                    Expressions.stringTemplate(
-              .otherwise(0L)
+                                            "to_char({0}, 'YYYY-MM-DD')",
-              .sum()
+                                            labelingAssignmentEntity.modifiedDate)
-              .as("day3AgoDoneCnt"),
+                                        .eq(s3)))
-              new CaseBuilder()
+                        .then(1L)
-                .when(labelingAssignmentEntity.workState.eq("DONE")
+                        .otherwise(0L)
-                  .and(
+                        .sum()
-                    Expressions.stringTemplate(
+                        .as("day3AgoDoneCnt"),
-                      "to_char({0}, 'YYYY-MM-DD')", labelingAssignmentEntity.modifiedDate).eq(s2)                )
+                    new CaseBuilder()
-                )
+                        .when(
-                .then(1L)
+                            labelingAssignmentEntity
-                .otherwise(0L)
+                                .workState
-                .sum()
+                                .eq("DONE")
-                .as("day2AgoDoneCnt"),
+                                .and(
-            new CaseBuilder()
+                                    Expressions.stringTemplate(
-              .when(labelingAssignmentEntity.workState.eq("DONE")
+                                            "to_char({0}, 'YYYY-MM-DD')",
-                .and(
+                                            labelingAssignmentEntity.modifiedDate)
-                  Expressions.stringTemplate(
+                                        .eq(s2)))
-                    "to_char({0}, 'YYYY-MM-DD')", labelingAssignmentEntity.modifiedDate).eq(s1)                )
+                        .then(1L)
-              )
+                        .otherwise(0L)
-              .then(1L)
+                        .sum()
-              .otherwise(0L)
+                        .as("day2AgoDoneCnt"),
-              .sum()
+                    new CaseBuilder()
-              .as("day1AgoDoneCnt")
+                        .when(
-            ))
+                            labelingAssignmentEntity
-        .from(labelingAssignmentEntity)
+                                .workState
-        .innerJoin(memberEntity)
+                                .eq("DONE")
-        .on(whereSubBuilder)
+                                .and(
-        .where(whereBuilder)
+                                    Expressions.stringTemplate(
-        .groupBy(
+                                            "to_char({0}, 'YYYY-MM-DD')",
-          memberEntity.userRole,
+                                            labelingAssignmentEntity.modifiedDate)
-          memberEntity.name,
+                                        .eq(s1)))
-          memberEntity.userId)
+                        .then(1L)
-        .offset(pageable.getOffset())
+                        .otherwise(0L)
-        .limit(pageable.getPageSize())
+                        .sum()
-        .fetch();
+                        .as("day1AgoDoneCnt")))
+            .from(labelingAssignmentEntity)
+            .innerJoin(memberEntity)
+            .on(whereSubBuilder)
+            .where(whereBuilder)
+            .groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId)
+            .offset(pageable.getOffset())
+            .limit(pageable.getPageSize())
+            .fetch();
 
     /*
     Long countQuery =
@@ -376,6 +372,4 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
             mapSheetAnalInferenceEntity.createdDttm)
         .fetchOne();
   }
-
-
 }