추론 실행 영구제외 조건 추가

추론 결과 UID 앞 8자리 추가
종료->완료, 종료->강제종료 상태 변경

src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java

@@ -311,7 +311,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                 mapSheetLearnEntity.mapSheetScope,
                 mapSheetLearnEntity.inferStartDttm,
                 mapSheetLearnEntity.inferEndDttm,
-                mapSheetLearnEntity.stage))
+                mapSheetLearnEntity.stage,
+                Expressions.stringTemplate("substring({0} from 1 for 8)", mapSheetLearnEntity.uid)))
         .from(mapSheetLearnEntity)
         .leftJoin(m1)
         .on(mapSheetLearnEntity.m1ModelUuid.eq(m1.uuid))
@@ -426,7 +427,10 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     mapSheetAnalDataInferenceGeomEntity.classAfterCd,
                     mapSheetAnalDataInferenceGeomEntity.classAfterProb,
                     mapSheetAnalDataInferenceGeomEntity.mapSheetNum,
-                    mapInkx5kEntity.mapidNm))
+                    mapInkx5kEntity.mapidNm,
+                    Expressions.stringTemplate(
+                        "substring({0} from 1 for 8)",
+                        mapSheetAnalDataInferenceGeomEntity.resultUid)))
             .from(mapSheetAnalInferenceEntity)
             .join(mapSheetAnalDataInferenceEntity)
             .on(mapSheetAnalDataInferenceEntity.analUid.eq(mapSheetAnalInferenceEntity.id))

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java

@@ -7,6 +7,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngHstEntity.mapSh
 import static com.kamco.cd.kamcoback.postgres.entity.QYearEntity.yearEntity;
 import static com.querydsl.core.types.dsl.Expressions.nullExpression;
 
+import com.kamco.cd.kamcoback.common.enums.CommonUseStatus;
 import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.ImageFeature;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope;
@@ -531,6 +532,12 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
                 nullExpression(Integer.class),
                 nullExpression(Boolean.class)))
         .from(mapSheetMngHstEntity)
+        .innerJoin(mapInkx5kEntity)
+        .on(
+            mapInkx5kEntity
+                .mapidcdNo
+                .eq(mapSheetMngHstEntity.mapSheetNum)
+                .and(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE)))
         .where(whereBuilder)
         .fetch();
   }
@@ -580,6 +587,8 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
           ORDER BY x::int DESC
           LIMIT 1
         ) s ON true
+        INNER JOIN tb_map_inkx_5k tmik
+        ON t.map_sheet_num = tmik.mapidcd_no AND tmik.use_inference = 'USE'
         WHERE t.map_sheet_num = ANY(:mapIds)
         """;