From ea03c5f07f752682cb68aaf3fe80feb5c59f5155 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Tue, 27 Jan 2026 16:26:41 +0900 Subject: [PATCH] =?UTF-8?q?uploadPair,=20=EB=9D=BC=EB=B2=A8=EB=A7=81=20?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EB=AA=A9=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamco/cd/kamcoback/label/dto/LabelWorkDto.java | 3 +++ .../mapsheet/service/MapSheetMngService.java | 4 +++- .../repository/label/LabelWorkRepositoryImpl.java | 12 ++++++++---- .../members/MemberInactiveJobRepositoryImpl.java | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java index 89d569d4..b9af35e6 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java +++ b/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; } diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java index 66c98948..e6cfe73c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java +++ b/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 mngFiles = mapSheetMngCoreService.findByHstUidMapSheetFileList(hstUid); String uploadPath = ""; for (MngFilesDto dto : mngFiles) { - uploadPath = dto.getFilePath() + "/" + errDto.getUuid(); + uploadPath = dto.getFilePath(); break; } diff --git 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 index 3150d1af..fea8e9d4 100644 --- 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 @@ -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()) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MemberInactiveJobRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MemberInactiveJobRepositoryImpl.java index 2408ace0..e90c6550 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MemberInactiveJobRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MemberInactiveJobRepositoryImpl.java @@ -21,7 +21,7 @@ public class MemberInactiveJobRepositoryImpl implements MemberInactiveJobReposit @Override public List 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)