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

labelState 조건 수정

Browse Source
This commit is contained in:
Gina(박가연)
2026-01-05 16:31:43 +09:00
parent 27d33dac3b
commit eb47698c2f
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ public class LabelWorkDto {
@JsonFormatDttm private ZonedDateTime createdDttm; @JsonFormatDttm private ZonedDateTime createdDttm;
private Long detectionTotCnt; private Long detectionTotCnt;
private Long labelTotCnt; private Long labelTotCnt;
private Long labelAssignCnt;
private Long labelStopTotCnt; private Long labelStopTotCnt;
private Long labelIngTotCnt; private Long labelIngTotCnt;
private Long labelCompleteTotCnt; private Long labelCompleteTotCnt;
@@ -59,7 +60,7 @@ public class LabelWorkDto {
if (this.labelTotCnt == 0) { if (this.labelTotCnt == 0) {
mngState = "PENDING"; mngState = "PENDING";
} else if (this.labelTotCnt > 0 && this.labelIngTotCnt == 0) { } else if (this.labelTotCnt > 0 && this.labelAssignCnt > 0 && this.labelIngTotCnt == 0) {
mngState = "ASSIGNED"; mngState = "ASSIGNED";
} else if (this.labelIngTotCnt > 0) { } else if (this.labelIngTotCnt > 0) {
mngState = "LABEL_ING"; mngState = "LABEL_ING";

2
src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java
View File

@@ -72,6 +72,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
.from(mapSheetAnalDataInferenceGeomEntity) .from(mapSheetAnalDataInferenceGeomEntity)
.where( .where(
lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId), lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId),
mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy), mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy), mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
mapSheetAnalDataInferenceGeomEntity.stage.eq(stage), mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),
@@ -160,6 +161,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
.select(mapSheetAnalDataInferenceGeomEntity.geoUid.count()) .select(mapSheetAnalDataInferenceGeomEntity.geoUid.count())
.from(mapSheetAnalDataInferenceGeomEntity) .from(mapSheetAnalDataInferenceGeomEntity)
.where( .where(
mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy), mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy), mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
mapSheetAnalDataInferenceGeomEntity.stage.eq(stage), mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),

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

@@ -137,6 +137,11 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
.then(1L) .then(1L)
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
new CaseBuilder()
.when(mapSheetAnalDataInferenceGeomEntity.labelState.eq("ASSIGNED"))
.then(1L)
.otherwise(0L)
.sum(),
new CaseBuilder() new CaseBuilder()
.when(mapSheetAnalDataInferenceGeomEntity.labelState.eq("STOP")) .when(mapSheetAnalDataInferenceGeomEntity.labelState.eq("STOP"))
.then(1L) .then(1L)