Merge pull request 'feat/dev_251201' (#140) from feat/dev_251201 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/140
2026-01-05 15:04:10 +09:00
parent 375609c451 067862ff12
commit 74025fb729
12 changed files with 363 additions and 8 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
@@ -4,8 +4,8 @@ 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.postgres.repository.label.LabelWorkRepository;
-import com.kamco.cd.kamcoback.postgres.repository.members.MembersRepository;
 import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
 public class LabelWorkCoreService {

  private final LabelWorkRepository labelWorkRepository;
-  private final MembersRepository membersRepository;

  /**
   * 변화탐지 년도 셀렉트박스 조회
@@ -44,6 +43,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/Inference/InferenceResultRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
@@ -5,7 +5,6 @@ import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
 import java.time.ZonedDateTime;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -16,8 +15,7 @@ import org.springframework.stereotype.Repository;
 public class InferenceResultRepositoryImpl implements InferenceResultRepositoryCustom {

  private final JPAQueryFactory queryFactory;
-
-  @PersistenceContext private final EntityManager em;
+  private final EntityManager em;

  /** tb_map_sheet_anal_data_inference */
  private final QMapSheetAnalDataInferenceEntity inferenceEntity =
--- 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
@@ -3,6 +3,7 @@ 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.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;
@@ -15,4 +16,6 @@ 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
@@ -4,10 +4,12 @@ import static com.kamco.cd.kamcoback.postgres.entity.QLabelingAssignmentEntity.l
 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.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.postgres.entity.MapSheetAnalDataGeomEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity;
 import com.querydsl.core.BooleanBuilder;
@@ -20,6 +22,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;
@@ -124,7 +128,15 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
                    mapSheetAnalInferenceEntity.stage,
                    mapSheetAnalDataInferenceEntity.createdDttm.min(),
                    mapSheetAnalDataInferenceGeomEntity.dataUid.count(),
-                    mapSheetAnalDataInferenceGeomEntity.dataUid.count(),
+                    new CaseBuilder()
+                        .when(
+                            mapSheetAnalDataInferenceGeomEntity
+                                .pnu
+                                .isNotNull()
+                                .and(mapSheetAnalDataInferenceGeomEntity.pnu.ne(0L)))
+                        .then(1L)
+                        .otherwise(0L)
+                        .sum(),
                    new CaseBuilder()
                        .when(mapSheetAnalDataInferenceGeomEntity.labelState.eq("STOP"))
                        .then(1L)
@@ -191,6 +203,132 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
    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 totalCnt =
+        (long)
+            queryFactory
+                .select(memberEntity.userRole, memberEntity.name, memberEntity.userId)
+                .from(labelingAssignmentEntity)
+                .innerJoin(memberEntity)
+                .on(whereSubBuilder)
+                .where(whereBuilder)
+                .groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId)
+                .fetch()
+                .size();
+
+    return new PageImpl<>(foundContent, pageable, totalCnt);
+  }
+
  /**
   * 작업배정 상세조회
   *