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

src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java

@@ -280,10 +280,10 @@ public class LabelAllocateApiController {
                 {"closedType": "INSPECTION", "closedYn": "N"}
                 """),
                         @io.swagger.v3.oas.annotations.media.ExampleObject(
-                            name = "특정 프로젝트 라벨링 종료",
+                            name = "특정 프로젝트 라벨링 전체 종료",
                             value =
                                 """
-                                {"uuid": "f97dc186-e6d3-4645-9737-3173dde8dc64", "closedType": "LABELING", "closedYn": "Y"}
+                {"uuid": "f97dc186-e6d3-4645-9737-3173dde8dc64", "closedType": "INSPECTION", "closedYn": "Y"}
                 """)
                       }))
           @RequestBody

src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java

@@ -58,6 +58,10 @@ public class LabelWorkDto {
     private String labelingClosedYn;
     private String inspectionClosedYn;
 
+    private Long inspectorCompleteTotCnt;
+    private Long inspectorRemainCnt;
+    private ZonedDateTime projectCloseDttm;
+
     @JsonProperty("detectYear")
     public String getDetectYear() {
       if (compareYyyy == null || targetYyyy == null) {

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

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.postgres.repository.label;
 
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
@@ -204,7 +205,25 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     // totalAssignmentCnt: 총 배정 건수 (서브쿼리)
                     totalAssignmentCntSubQuery,
                     mapSheetAnalInferenceEntity.labelingClosedYn,
-                    mapSheetAnalInferenceEntity.inspectionClosedYn))
+                    mapSheetAnalInferenceEntity.inspectionClosedYn,
+                    new CaseBuilder()
+                        .when(
+                            mapSheetAnalDataInferenceGeomEntity.testState.eq(
+                                InspectState.COMPLETE.getId()))
+                        .then(1L)
+                        .otherwise(0L)
+                        .sum(),
+                    new CaseBuilder()
+                        .when(
+                            mapSheetAnalDataInferenceGeomEntity.testState.eq(
+                                InspectState.UNCONFIRM.getId()))
+                        .then(1L)
+                        .otherwise(0L)
+                        .sum(),
+                    new CaseBuilder()
+                        .when(mapSheetAnalInferenceEntity.inspectionClosedYn.eq("Y"))
+                        .then(mapSheetAnalInferenceEntity.updatedDttm)
+                        .otherwise((ZonedDateTime) null)))
             .from(mapSheetAnalInferenceEntity)
             .innerJoin(mapSheetAnalDataInferenceEntity)
             .on(whereSubDataBuilder)