Merge pull request '학습데이터 목록에 추론 uuid 컬럼도 추가' (#306) from feat/infer_dev_260107 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/306
This commit is contained in:
@@ -64,6 +64,7 @@ public class LabelWorkDto {
|
|||||||
|
|
||||||
private String resultUid;
|
private String resultUid;
|
||||||
private String subUid;
|
private String subUid;
|
||||||
|
private UUID learnUuid;
|
||||||
|
|
||||||
@JsonProperty("detectYear")
|
@JsonProperty("detectYear")
|
||||||
public String getDetectYear() {
|
public String getDetectYear() {
|
||||||
|
|||||||
@@ -233,7 +233,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
|
|||||||
.otherwise((ZonedDateTime) null),
|
.otherwise((ZonedDateTime) null),
|
||||||
mapSheetLearnEntity.uid,
|
mapSheetLearnEntity.uid,
|
||||||
Expressions.stringTemplate(
|
Expressions.stringTemplate(
|
||||||
"substring({0} from 1 for 8)", mapSheetLearnEntity.uid)))
|
"substring({0} from 1 for 8)", mapSheetLearnEntity.uid),
|
||||||
|
mapSheetLearnEntity.uuid))
|
||||||
.from(mapSheetAnalInferenceEntity)
|
.from(mapSheetAnalInferenceEntity)
|
||||||
.innerJoin(mapSheetAnalDataInferenceEntity)
|
.innerJoin(mapSheetAnalDataInferenceEntity)
|
||||||
.on(whereSubDataBuilder)
|
.on(whereSubDataBuilder)
|
||||||
@@ -250,7 +251,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
|
|||||||
mapSheetAnalInferenceEntity.createdDttm,
|
mapSheetAnalInferenceEntity.createdDttm,
|
||||||
mapSheetAnalInferenceEntity.analState,
|
mapSheetAnalInferenceEntity.analState,
|
||||||
mapSheetAnalInferenceEntity.id,
|
mapSheetAnalInferenceEntity.id,
|
||||||
mapSheetLearnEntity.uid)
|
mapSheetLearnEntity.uid,
|
||||||
|
mapSheetLearnEntity.uuid)
|
||||||
.orderBy(
|
.orderBy(
|
||||||
mapSheetAnalInferenceEntity.targetYyyy.desc(),
|
mapSheetAnalInferenceEntity.targetYyyy.desc(),
|
||||||
mapSheetAnalInferenceEntity.compareYyyy.desc(),
|
mapSheetAnalInferenceEntity.compareYyyy.desc(),
|
||||||
|
|||||||
Reference in New Issue
Block a user