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

# Conflicts: # src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java # src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java # src/main/java/com/kamco/cd/kamcoback/label/service/LabelWorkService.java # src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelWorkCoreService.java # src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryCustom.java # src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java
2026-01-05 14:45:03 +09:00
parent 539831c712 2db7177edd
commit 9e7c73674f
7 changed files with 333 additions and 25 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelWorkCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelWorkCoreService.java
@@ -1,13 +1,10 @@
 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 com.kamco.cd.kamcoback.postgres.repository.members.MembersRepository;
-import java.util.List;
-import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -17,7 +14,6 @@ import org.springframework.stereotype.Service;
 public class LabelWorkCoreService {

  private final LabelWorkRepository labelWorkRepository;
-  private final MembersRepository membersRepository;

  /**
   * 변화탐지 년도 셀렉트박스 조회
@@ -44,6 +40,11 @@ public class LabelWorkCoreService {
    return labelWorkRepository.labelWorkMngList(searchReq);
  }

+  public Page<WorkerState> findlabelWorkStateList(LabelWorkDto.WorkerStateSearchReq searchReq)
+  {
+    return labelWorkRepository.findlabelWorkStateList(searchReq);
+  };
+
  /**
   * 작업배정 정보 조회
   *
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryCustom.java
@@ -2,6 +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.postgres.entity.MapSheetAnalInferenceEntity;
 import java.util.List;
@@ -15,4 +17,7 @@ public interface LabelWorkRepositoryCustom {
  public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq);

  LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid);
+
+  Page<WorkerState> findlabelWorkStateList(LabelWorkDto.WorkerStateSearchReq searchReq);
+
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java
@@ -1,13 +1,21 @@
 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;
@@ -20,6 +28,8 @@ import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
@@ -185,6 +195,129 @@ 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();
+
+    return new PageImpl<>(foundContent, pageable, total);
+  }
+
+
+  @Override
+  public Page<WorkerState> findlabelWorkStateList(LabelWorkDto.WorkerStateSearchReq searchReq){
+    Pageable pageable = PageRequest.of(searchReq.getPage(), searchReq.getSize());
+    BooleanBuilder whereBuilder = new BooleanBuilder();
+    BooleanBuilder whereSubBuilder = new BooleanBuilder();
+
+    LocalDate threeDaysAgo = LocalDate.now().minusDays(3);
+    String s3 = threeDaysAgo.format(DateTimeFormatter.ofPattern("YYYY-MM-DD"));
+
+    LocalDate twoDaysAgo = LocalDate.now().minusDays(2);
+    String s2 = twoDaysAgo.format(DateTimeFormatter.ofPattern("YYYY-MM-DD"));
+
+    LocalDate oneDaysAgo = LocalDate.now().minusDays(1);
+    String s1 = oneDaysAgo.format(DateTimeFormatter.ofPattern("YYYY-MM-DD"));
+
+    if (searchReq.getUserRole() != null && ! searchReq.getUserRole().isEmpty()) {
+      whereSubBuilder.and(memberEntity.userRole.eq(searchReq.getUserRole()));
+    }
+
+    if (searchReq.getSearchVal() != null && ! searchReq.getSearchVal().isEmpty()) {
+      whereSubBuilder.and(
+        Expressions.stringTemplate(
+            "{0}",memberEntity.userId)
+          .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
+          .or(
+            Expressions.stringTemplate(
+                "{0}",memberEntity.name)
+              .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
+          )
+      );
+    }
+
+    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();
+
+    /*
+    Long countQuery =
+      queryFactory
+        .select(labelingAssignmentEntity.workerUid.count())
+        .from(labelingAssignmentEntity)
+        .where(whereBuilder)
+        .fetchOne();
+    */
+
    Long total =
        queryFactory
            .select(mapSheetAnalInferenceEntity.uuid.countDistinct())
@@ -243,4 +376,6 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
            mapSheetAnalInferenceEntity.createdDttm)
        .fetchOne();
  }
+
+
 }