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

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
-        .select(mapSheetAnalInferenceEntity.uuid.countDistinct())
-        .from(mapSheetAnalInferenceEntity)
-        .innerJoin(mapSheetAnalDataInferenceEntity)
-        .on(whereSubDataBuilder)
-        .innerJoin(mapSheetAnalDataInferenceGeomEntity)
-        .on(whereSubBuilder)
-        .where(whereBuilder)
-        .fetchOne();
+        queryFactory
+            .select(mapSheetAnalInferenceEntity.uuid.countDistinct())
+            .from(mapSheetAnalInferenceEntity)
+            .innerJoin(mapSheetAnalDataInferenceEntity)
+            .on(whereSubDataBuilder)
+            .innerJoin(mapSheetAnalDataInferenceGeomEntity)
+            .on(whereSubBuilder)
+            .where(whereBuilder)
+            .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(
-            "{0}",memberEntity.userId)
-          .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
-          .or(
-            Expressions.stringTemplate(
-                "{0}",memberEntity.name)
+          Expressions.stringTemplate("{0}", memberEntity.userId)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
-          )
-      );
+              .or(
+                  Expressions.stringTemplate("{0}", memberEntity.name)
+                      .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(
-      labelingAssignmentEntity.workerUid.eq(memberEntity.userId));
+    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.userId));
 
     List<WorkerState> foundContent =
-      queryFactory
-        .select(
-          Projections.constructor(
-            WorkerState.class,
-            memberEntity.userRole,
-            memberEntity.name,
-            memberEntity.userId,
-            labelingAssignmentEntity.workerUid.count().as("assignedCnt"),
-            new CaseBuilder()
-              .when(labelingAssignmentEntity.workState.eq("DONE"))
-              .then(1L)
-              .otherwise(0L)
-              .sum()
-              .as("doneCnt"),
-            new CaseBuilder()
-              .when(labelingAssignmentEntity.workState.eq("SKIP"))
-              .then(1L)
-              .otherwise(0L)
-              .sum()
-              .as("skipCnt"),
-            new CaseBuilder()
-              .when(labelingAssignmentEntity.workState.eq("DONE")
-                .and(
-                  Expressions.stringTemplate(
-                      "to_char({0}, 'YYYY-MM-DD')", labelingAssignmentEntity.modifiedDate).eq(s3)                )
-              )
-              .then(1L)
-              .otherwise(0L)
-              .sum()
-              .as("day3AgoDoneCnt"),
-              new CaseBuilder()
-                .when(labelingAssignmentEntity.workState.eq("DONE")
-                  .and(
-                    Expressions.stringTemplate(
-                      "to_char({0}, 'YYYY-MM-DD')", labelingAssignmentEntity.modifiedDate).eq(s2)                )
-                )
-                .then(1L)
-                .otherwise(0L)
-                .sum()
-                .as("day2AgoDoneCnt"),
-            new CaseBuilder()
-              .when(labelingAssignmentEntity.workState.eq("DONE")
-                .and(
-                  Expressions.stringTemplate(
-                    "to_char({0}, 'YYYY-MM-DD')", labelingAssignmentEntity.modifiedDate).eq(s1)                )
-              )
-              .then(1L)
-              .otherwise(0L)
-              .sum()
-              .as("day1AgoDoneCnt")
-            ))
-        .from(labelingAssignmentEntity)
-        .innerJoin(memberEntity)
-        .on(whereSubBuilder)
-        .where(whereBuilder)
-        .groupBy(
-          memberEntity.userRole,
-          memberEntity.name,
-          memberEntity.userId)
-        .offset(pageable.getOffset())
-        .limit(pageable.getPageSize())
-        .fetch();
+        queryFactory
+            .select(
+                Projections.constructor(
+                    WorkerState.class,
+                    memberEntity.userRole,
+                    memberEntity.name,
+                    memberEntity.userId,
+                    labelingAssignmentEntity.workerUid.count().as("assignedCnt"),
+                    new CaseBuilder()
+                        .when(labelingAssignmentEntity.workState.eq("DONE"))
+                        .then(1L)
+                        .otherwise(0L)
+                        .sum()
+                        .as("doneCnt"),
+                    new CaseBuilder()
+                        .when(labelingAssignmentEntity.workState.eq("SKIP"))
+                        .then(1L)
+                        .otherwise(0L)
+                        .sum()
+                        .as("skipCnt"),
+                    new CaseBuilder()
+                        .when(
+                            labelingAssignmentEntity
+                                .workState
+                                .eq("DONE")
+                                .and(
+                                    Expressions.stringTemplate(
+                                            "to_char({0}, 'YYYY-MM-DD')",
+                                            labelingAssignmentEntity.modifiedDate)
+                                        .eq(s3)))
+                        .then(1L)
+                        .otherwise(0L)
+                        .sum()
+                        .as("day3AgoDoneCnt"),
+                    new CaseBuilder()
+                        .when(
+                            labelingAssignmentEntity
+                                .workState
+                                .eq("DONE")
+                                .and(
+                                    Expressions.stringTemplate(
+                                            "to_char({0}, 'YYYY-MM-DD')",
+                                            labelingAssignmentEntity.modifiedDate)
+                                        .eq(s2)))
+                        .then(1L)
+                        .otherwise(0L)
+                        .sum()
+                        .as("day2AgoDoneCnt"),
+                    new CaseBuilder()
+                        .when(
+                            labelingAssignmentEntity
+                                .workState
+                                .eq("DONE")
+                                .and(
+                                    Expressions.stringTemplate(
+                                            "to_char({0}, 'YYYY-MM-DD')",
+                                            labelingAssignmentEntity.modifiedDate)
+                                        .eq(s1)))
+                        .then(1L)
+                        .otherwise(0L)
+                        .sum()
+                        .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();
   }
-
-
 }