diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java index 9f0663e8..fef1c33e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java @@ -22,12 +22,7 @@ public class LabelAllocateDto { public enum LabelMngState implements EnumType { PENDING("작업대기"), ASSIGNED("작업할당"), - STOP("중단"), - LABEL_ING("라벨진행중"), - LABEL_COMPLETE("라벨완료"), - INSPECT_REQ("검수요청"), - INSPECT_ING("검수진행중"), - INSPECT_COMPLETE("검수완료"), + ING("진행중"), FINISH("종료"); private String desc; 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 761567d1..2fd6f313 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 @@ -85,9 +85,7 @@ public class LabelWorkDto { } else if (this.labelTotCnt > 0 && this.labelAssignCnt > 0 && this.labelCompleteTotCnt == 0) { mngState = LabelMngState.ASSIGNED.getId(); } else if (this.labelCompleteTotCnt > 0) { - mngState = LabelMngState.LABEL_ING.getId(); - } else if (this.labelTotCnt <= labelCompleteTotCnt) { - mngState = LabelMngState.LABEL_COMPLETE.getId(); + mngState = LabelMngState.ING.getId(); } else if (this.labelingClosedYn.equals("Y") && this.inspectionClosedYn.equals("Y")) { mngState = LabelMngState.FINISH.getId(); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java index e5e21aca..8214b365 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java @@ -8,6 +8,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalSttcEntity.map import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity; import static com.kamco.cd.kamcoback.postgres.entity.QSystemMetricEntity.systemMetricEntity; +import com.kamco.cd.kamcoback.common.exception.CustomApiException; import com.kamco.cd.kamcoback.common.utils.DateRange; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.AnalResultInfo; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Dashboard; @@ -38,6 +39,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Repository; @Repository @@ -367,7 +369,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto .fetchOne(); if (Objects.isNull(analEntity)) { - throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: "); + throw new CustomApiException("NOT_FOUND_DATA", HttpStatus.NOT_FOUND); } // 추론결과 id