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 9659cac2..89d569d4 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 @@ -64,6 +64,7 @@ public class LabelWorkDto { private String resultUid; private String subUid; + private UUID learnUuid; @JsonProperty("detectYear") public String getDetectYear() { 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 61261062..3150d1af 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 @@ -233,7 +233,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom { .otherwise((ZonedDateTime) null), mapSheetLearnEntity.uid, Expressions.stringTemplate( - "substring({0} from 1 for 8)", mapSheetLearnEntity.uid))) + "substring({0} from 1 for 8)", mapSheetLearnEntity.uid), + mapSheetLearnEntity.uuid)) .from(mapSheetAnalInferenceEntity) .innerJoin(mapSheetAnalDataInferenceEntity) .on(whereSubDataBuilder) @@ -250,7 +251,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom { mapSheetAnalInferenceEntity.createdDttm, mapSheetAnalInferenceEntity.analState, mapSheetAnalInferenceEntity.id, - mapSheetLearnEntity.uid) + mapSheetLearnEntity.uid, + mapSheetLearnEntity.uuid) .orderBy( mapSheetAnalInferenceEntity.targetYyyy.desc(), mapSheetAnalInferenceEntity.compareYyyy.desc(),