diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java index dc802da3..0f9898a2 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java @@ -215,8 +215,10 @@ public class InferenceResultDto { public static class Geom { Integer compareYyyy; Integer targetYyyy; + String classBeforeCd; String classBeforeName; Double classBeforeProb; + String classAfterCd; String classAfterName; Double classAfterProb; Long mapSheetNum; @@ -224,16 +226,20 @@ public class InferenceResultDto { public Geom( Integer compareYyyy, Integer targetYyyy, + String classBeforeCd, String classBeforeName, Double classBeforeProb, + String classAfterCd, String classAfterName, Double classAfterProb, Long mapSheetNum ) { this.compareYyyy = compareYyyy; this.targetYyyy = targetYyyy; + this.classBeforeCd = classBeforeCd; this.classBeforeName = classBeforeName; this.classBeforeProb = classBeforeProb; + this.classAfterCd = classAfterCd; this.classAfterName = classAfterName; this.classAfterProb = classAfterProb; this.mapSheetNum = mapSheetNum; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java index d41ae4ff..416a38a5 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java @@ -181,8 +181,10 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC mapSheetAnalDataGeom.compareYyyy, mapSheetAnalDataGeom.targetYyyy, mapSheetAnalDataGeom.classBeforeCd, + Expressions.stringTemplate("fn_code_name({0}, {1})", "0000", mapSheetAnalDataGeom.classBeforeCd), mapSheetAnalDataGeom.classBeforeProb, mapSheetAnalDataGeom.classAfterCd, + Expressions.stringTemplate("fn_code_name({0}, {1})", "0000", mapSheetAnalDataGeom.classAfterCd), mapSheetAnalDataGeom.classAfterProb, mapSheetAnalDataGeom.mapSheetNum)) .from(mapSheetAnalDataGeom)