From cf7d25072b95feecc1c0d413b2b9b13ea616ee43 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Thu, 22 Jan 2026 12:03:54 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=99=EC=8A=B5=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=EC=97=90=20=EC=B6=94=EB=A1=A0=20uuid=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=BC=EB=8F=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java | 1 + .../postgres/repository/label/LabelWorkRepositoryImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) 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(),