MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '학습데이터 목록 analState 적용' (#287) from feat/infer_dev_260107 into develop

Browse Source 
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/287
This commit is contained in:
Gina(박가연)
2026-01-20 15:19:44 +09:00
parent 6c2b7fe8ec af75c2b8d5
commit d653865cee
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,8 @@ public class LabelWorkDto {
private Long labelCompleteTotCnt; private Long labelCompleteTotCnt;
@JsonFormatDttm private ZonedDateTime labelStartDttm; @JsonFormatDttm private ZonedDateTime labelStartDttm;
// tb_map_sheet_anal_inference.anal_state 컬럼 값 -> 미사용 // tb_map_sheet_anal_inference.anal_state 컬럼 값
// private String analState; private String analState;
// tb_labeling_assignment 테이블에서 stagnation_yn = 'N'인 정상 진행 건수 // tb_labeling_assignment 테이블에서 stagnation_yn = 'N'인 정상 진행 건수
private Long normalProgressCnt; private Long normalProgressCnt;
@@ -73,9 +73,9 @@ public class LabelWorkDto {
/** 라벨링 상태 반환 (tb_map_sheet_anal_inference.anal_state 기준) */ /** 라벨링 상태 반환 (tb_map_sheet_anal_inference.anal_state 기준) */
public String getLabelState() { public String getLabelState() {
// anal_state 값이 있으면 해당 값 사용 -> 우선은 미사용 // anal_state 값이 있으면 해당 값 사용 -> 우선은 미사용
// if (this.analState != null && !this.analState.isEmpty()) { if (this.analState != null && !this.analState.isEmpty()) {
// return this.analState; return this.analState;
// } }
// anal_state 값이 없으면 기존 로직으로 폴백 // anal_state 값이 없으면 기존 로직으로 폴백
String mngState = LabelMngState.PENDING.getId(); String mngState = LabelMngState.PENDING.getId();
@@ -84,10 +84,10 @@ public class LabelWorkDto {
mngState = LabelMngState.PENDING.getId(); mngState = LabelMngState.PENDING.getId();
} else if (this.labelTotCnt > 0 && this.labelAssignCnt > 0 && this.labelCompleteTotCnt == 0) { } else if (this.labelTotCnt > 0 && this.labelAssignCnt > 0 && this.labelCompleteTotCnt == 0) {
mngState = LabelMngState.ASSIGNED.getId(); mngState = LabelMngState.ASSIGNED.getId();
} else if (this.labelCompleteTotCnt > 0) {
mngState = LabelMngState.ING.getId();
} else if (this.labelingClosedYn.equals("Y") && this.inspectionClosedYn.equals("Y")) { } else if (this.labelingClosedYn.equals("Y") && this.inspectionClosedYn.equals("Y")) {
mngState = LabelMngState.FINISH.getId(); mngState = LabelMngState.FINISH.getId();
} else if (this.labelCompleteTotCnt > 0) {
mngState = LabelMngState.ING.getId();
} }
return mngState; return mngState;

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

@@ -200,9 +200,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
mapSheetAnalDataInferenceGeomEntity.labelStateDttm.min(), mapSheetAnalDataInferenceGeomEntity.labelStateDttm.min(),
// analState: tb_map_sheet_anal_inference.anal_state -> 우선은 미사용, java 단에서 로직화 해서 // analState: tb_map_sheet_anal_inference.anal_state
// 내려줌 mapSheetAnalInferenceEntity.analState,
// mapSheetAnalInferenceEntity.analState,
// normalProgressCnt: stagnation_yn = 'N'인 건수 (서브쿼리) // normalProgressCnt: stagnation_yn = 'N'인 건수 (서브쿼리)
normalProgressCntSubQuery, normalProgressCntSubQuery,
// totalAssignmentCnt: 총 배정 건수 (서브쿼리) // totalAssignmentCnt: 총 배정 건수 (서브쿼리)