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 2fd6f313..03280382 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 @@ -46,8 +46,8 @@ public class LabelWorkDto { private Long labelCompleteTotCnt; @JsonFormatDttm private ZonedDateTime labelStartDttm; - // tb_map_sheet_anal_inference.anal_state 컬럼 값 -> 미사용 - // private String analState; + // tb_map_sheet_anal_inference.anal_state 컬럼 값 + private String analState; // tb_labeling_assignment 테이블에서 stagnation_yn = 'N'인 정상 진행 건수 private Long normalProgressCnt; @@ -73,9 +73,9 @@ public class LabelWorkDto { /** 라벨링 상태 반환 (tb_map_sheet_anal_inference.anal_state 기준) */ public String getLabelState() { // anal_state 값이 있으면 해당 값 사용 -> 우선은 미사용 - // if (this.analState != null && !this.analState.isEmpty()) { - // return this.analState; - // } + if (this.analState != null && !this.analState.isEmpty()) { + return this.analState; + } // anal_state 값이 없으면 기존 로직으로 폴백 String mngState = LabelMngState.PENDING.getId(); @@ -84,10 +84,10 @@ public class LabelWorkDto { mngState = LabelMngState.PENDING.getId(); } else if (this.labelTotCnt > 0 && this.labelAssignCnt > 0 && this.labelCompleteTotCnt == 0) { mngState = LabelMngState.ASSIGNED.getId(); - } else if (this.labelCompleteTotCnt > 0) { - mngState = LabelMngState.ING.getId(); } else if (this.labelingClosedYn.equals("Y") && this.inspectionClosedYn.equals("Y")) { mngState = LabelMngState.FINISH.getId(); + } else if (this.labelCompleteTotCnt > 0) { + mngState = LabelMngState.ING.getId(); } return mngState; 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 03aacd43..664a5ccc 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 @@ -200,9 +200,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom { .otherwise(0L) .sum(), mapSheetAnalDataInferenceGeomEntity.labelStateDttm.min(), - // analState: tb_map_sheet_anal_inference.anal_state -> 우선은 미사용, java 단에서 로직화 해서 - // 내려줌 - // mapSheetAnalInferenceEntity.analState, + // analState: tb_map_sheet_anal_inference.anal_state + mapSheetAnalInferenceEntity.analState, // normalProgressCnt: stagnation_yn = 'N'인 건수 (서브쿼리) normalProgressCntSubQuery, // totalAssignmentCnt: 총 배정 건수 (서브쿼리)