Merge pull request 'feat/infer_dev_260107' (#261) from feat/infer_dev_260107 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/261

src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java

@@ -419,6 +419,7 @@ public class InferenceDetailDto {
     private UUID m1ModelUuid;
     private UUID m2ModelUuid;
     private UUID m3ModelUuid;
+    private String uid;
   }
 
   @Schema(name = "AnalResultInfo", description = "추론결과 기본정보")

src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java

@@ -175,6 +175,9 @@ public class InferenceResultDto {
     @Schema(description = "기준년도")
     private Integer targetYyyy;
 
+    @Schema(description = "uid")
+    private String uid;
+
     @Schema(description = "상태명")
     @JsonProperty("statusName")
     public String statusName() {

src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java

@@ -363,6 +363,7 @@ public class InferenceResultCoreService {
     inferenceBatchSheet.setM1ModelUuid(entity.getM1ModelUuid());
     inferenceBatchSheet.setM2ModelUuid(entity.getM2ModelUuid());
     inferenceBatchSheet.setM3ModelUuid(entity.getM3ModelUuid());
+    inferenceBatchSheet.setUid(entity.getUid());
     return inferenceBatchSheet;
   }
 

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java

@@ -186,6 +186,9 @@ public class MapSheetLearnEntity {
   @Column(name = "m3_failed_jobs", nullable = false)
   private int m3FailedJobs = 0;
 
+  @Column(name = "uid", nullable = false)
+  private String uid;
+
   public InferenceResultDto.ResultList toDto() {
     return new InferenceResultDto.ResultList(
         this.uuid,
@@ -199,6 +202,7 @@ public class MapSheetLearnEntity {
         this.applyYn,
         this.applyDttm,
         this.compareYyyy,
-        this.targetYyyy);
+        this.targetYyyy,
+        this.uid);
   }
 }

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

@@ -283,6 +283,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
         INNER JOIN tb_map_sheet_anal_data_inference_geom msadig
           ON msadi.data_uid = msadig.data_uid
         WHERE msai.anal_uid = :analUid
+          AND msadig.class_before_cd IS NOT NULL
+          AND msadig.class_after_cd  IS NOT NULL
         GROUP BY
           msadig.compare_yyyy
          ,msadig.target_yyyy

src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java

@@ -222,7 +222,6 @@ public class MapSheetInferenceJobService {
     List<InferenceResultsTestingDto.ShpDto> resultList =
         inferenceResultCoreService.getInferenceResults(batchIds);
     String inferenceId = "";
-    boolean first = true;
     StringBuilder sb = new StringBuilder();
 
     for (InferenceResultsTestingDto.ShpDto dto : resultList) {
@@ -233,12 +232,8 @@ public class MapSheetInferenceJobService {
         sb.append(",");
       }
       sb.append("\"").append(dto.getMapId()).append("\"");
-
-      if (first) {
-        inferenceId = dto.getUid();
-        first = false;
-      }
     }
+    inferenceId = sheet.getUid();
     String mapIds = sb.toString();
     String batchId = sheet.getM1BatchId() + "," + sheet.getM2BatchId() + "," + sheet.getM3BatchId();