Merge remote-tracking branch 'origin/feat/infer_dev_260107' into feat/infer_dev_260107

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java

src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java

@@ -240,7 +240,6 @@ public class InferenceResultApiController {
     return ApiResponseDto.ok(inferenceResultService.getInferenceServerStatusList());
   }
 
-
   @Operation(summary = "추론관리 진행현황 상세", description = "어드민 홈 > 추론관리 > 추론관리 > 진행현황 상세")
   @ApiResponses(
       value = {
@@ -257,7 +256,7 @@ public class InferenceResultApiController {
   @GetMapping("/status/{uuid}")
   public ApiResponseDto<InferenceStatusDetailDto> getInferenceStatus(
       @io.swagger.v3.oas.annotations.parameters.RequestBody(
-              description = "모델 삭제 요청 정보",
+              description = "추론진행현왕 요청 정보",
               required = true)
           @PathVariable
           UUID uuid) {

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

@@ -76,9 +76,7 @@ public class InferenceResultDto {
     }
   }
 
-  /**
+  /** 탐지 데이터 옵션 dto */
-   * 탐지 데이터 옵션 dto
-   */
   @Getter
   @AllArgsConstructor
   public enum MapSheetScope implements EnumType {
@@ -99,9 +97,7 @@ public class InferenceResultDto {
     }
   }
 
-  /**
+  /** 분석대상 도엽 enum */
-   * 분석대상 도엽 enum
-   */
   @Getter
   @AllArgsConstructor
   public enum DetectOption implements EnumType {
@@ -149,9 +145,7 @@ public class InferenceResultDto {
     }
   }
 
-  /**
+  /** 변화탐지 실행 정보 저장 요청 정보 */
-   * 변화탐지 실행 정보 저장 요청 정보
-   */
   @Getter
   @Setter
   @NoArgsConstructor
@@ -220,11 +214,10 @@ public class InferenceResultDto {
     private Integer targetYyyy;
     private String detectOption;
     private String mapSheetScope;
-    @JsonFormatDttm
+    @JsonFormatDttm private ZonedDateTime inferStartDttm;
-    private ZonedDateTime inferStartDttm;
+    @JsonFormatDttm private ZonedDateTime inferEndDttm;
-    @JsonFormatDttm
+    private Long detectingCnt = 0L;
-    private ZonedDateTime inferEndDttm;
+    private Long detectingEndCnt = 0L;
-    private Long detectingCnt;
 
     private String model1Ver;
     private String model2Ver;
@@ -239,6 +232,7 @@ public class InferenceResultDto {
         ZonedDateTime inferStartDttm,
         ZonedDateTime inferEndDttm,
         Long detectingCnt,
+        Long detectingEndCnt,
         String model1Ver,
         String model2Ver,
         String model3Ver) {
@@ -250,33 +244,43 @@ public class InferenceResultDto {
       this.inferStartDttm = inferStartDttm;
       this.inferEndDttm = inferEndDttm;
       this.detectingCnt = detectingCnt;
+      this.detectingEndCnt = detectingEndCnt;
       this.model1Ver = model1Ver;
       this.model2Ver = model2Ver;
       this.model3Ver = model3Ver;
+
+      if( this.detectingEndCnt == null )this.detectingEndCnt = 0L;
+
     }
 
     private String usedServerName;
-    private Long detectingEndCnt = 7L;
     private String model1VerStatus = "PROCCESING";
     private String model1VerStatusName = "진행중";
     private String model2VerStatus = "PROCCESING";
     private String model2VerStatusName = "진행중";
     private String model3VerStatus = "PROCCESING";
-    private String model4VerStatusName = "진행중";
+    private String model3VerStatusName = "진행중";
 
     public String getDetectOptionName() {
-      if (this.detectOption.equals("EXCL")) {
+      if (this.detectOption.equals("EXCL")) return "추론제외";
-        return "추론제외";
-      }
       return "이전 년도 도엽 사용";
     }
 
     public String getMapSheetScopeName() {
-      if (this.detectOption.equals("ALL")) {
+      if (this.mapSheetScope.equals("ALL")) return "전체";
-        return "전체";
-      }
       return "부분";
     }
+
+    public double getDetectingRate() {
+      if (this.detectingCnt == null || this.detectingCnt == 0L) {
+        return 0.0;
+      }
+
+      if( this.detectingEndCnt == null )this.detectingEndCnt = 0L;
+
+      return (double) (this.detectingEndCnt / this.detectingCnt) * 100.0;
+    }
+
   }
 
   @Getter

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java

@@ -1101,9 +1101,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
 
     Expression<Long> completeCnt =
         Expressions.numberTemplate(
-            Long.class,
+            Long.class, "COUNT(*) FILTER (WHERE {0} = 'DONE')", labelingAssignmentEntity.workState);
-            "COUNT(*) FILTER (WHERE {0} = 'COMPLETE')",
-            labelingAssignmentEntity.workState);
 
     Expression<Long> remainCnt =
         Expressions.numberTemplate(Long.class, "({0} - {1} - {2})", totalCnt, skipCnt, completeCnt);