uploadPair, 라벨링 현황 목록 수정

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

@@ -205,6 +205,9 @@ public class LabelWorkDto {
     @Schema(description = "1일전처리개수")
     private Long day1AgoDoneCnt;
 
+    @Schema(description = "계정 상태")
+    private String memberStatus;
+
     public Long getRemainCnt() {
       return this.assignedCnt - this.doneCnt;
     }

src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java

@@ -30,12 +30,14 @@ import java.nio.file.StandardCopyOption;
 import java.util.Comparator;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -166,7 +168,7 @@ public class MapSheetMngService {
     List<MngFilesDto> mngFiles = mapSheetMngCoreService.findByHstUidMapSheetFileList(hstUid);
     String uploadPath = "";
     for (MngFilesDto dto : mngFiles) {
-      uploadPath = dto.getFilePath() + "/" + errDto.getUuid();
+      uploadPath = dto.getFilePath();
       break;
     }
 

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

@@ -350,7 +350,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     skipCnt.as("skipCnt"),
                     day3AgoDoneCnt.as("day3AgoDoneCnt"),
                     day2AgoDoneCnt.as("day2AgoDoneCnt"),
-                    day1AgoDoneCnt.as("day1AgoDoneCnt")))
+                    day1AgoDoneCnt.as("day1AgoDoneCnt"),
+                    memberEntity.status))
             .from(labelingAssignmentEntity)
             .innerJoin(mapSheetAnalInferenceEntity)
             .on(
@@ -361,7 +362,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .innerJoin(memberEntity)
             .on(whereSubBuilder)
             .where(whereBuilder)
-            .groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId)
+            .groupBy(
+                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
@@ -496,7 +498,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     skipCnt.as("skipCnt"),
                     day3AgoDoneCnt.as("day3AgoDoneCnt"),
                     day2AgoDoneCnt.as("day2AgoDoneCnt"),
-                    day1AgoDoneCnt.as("day1AgoDoneCnt")))
+                    day1AgoDoneCnt.as("day1AgoDoneCnt"),
+                    memberEntity.status))
             .from(labelingAssignmentEntity)
             .innerJoin(mapSheetAnalInferenceEntity)
             .on(
@@ -507,7 +510,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .innerJoin(memberEntity)
             .on(whereSubBuilder)
             .where(whereBuilder)
-            .groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId)
+            .groupBy(
+                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())

src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MemberInactiveJobRepositoryImpl.java

@@ -21,7 +21,7 @@ public class MemberInactiveJobRepositoryImpl implements MemberInactiveJobReposit
 
   @Override
   public List<MemberInfo> findInactiveLabelerReviewer() {
-    ZonedDateTime checkTime = ZonedDateTime.now(ZoneId.of("Asia/Seoul")).minusDays(14);
+    ZonedDateTime checkTime = ZonedDateTime.now(ZoneId.of("Asia/Seoul")).minusDays(28);
     return queryFactory
         .select(Projections.constructor(MemberInfo.class, memberEntity.id, memberEntity.employeeNo))
         .from(memberEntity)