From c8cb64fbeaa21a7010daa3ee9c7b81d0e4753ec3 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 19 Jan 2026 17:55:50 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EB=A1=A0=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20geom-list=20=EB=B6=84=EC=84=9D=EB=8F=84?= =?UTF-8?q?=EC=97=BD=20=EA=B2=80=EC=83=89=20like=20=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inference/InferenceResultApiController.java | 2 +- .../inference/InferenceResultApiV2Controller.java | 3 +-- .../kamcoback/inference/dto/InferenceDetailDto.java | 2 +- .../MapSheetAnalDataInferenceRepositoryImpl.java | 11 ++++++----- .../Inference/MapSheetLearnRepositoryImpl.java | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java index 45133c4c..1357204e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java @@ -386,7 +386,7 @@ public class InferenceResultApiController { @Parameter(description = "비교년도 분류", example = "waste") @RequestParam(required = false) String compareClass, @Parameter(description = "5000:1 도엽번호 37801011,37801012") @RequestParam(required = false) - List mapSheetNum, + Long mapSheetNum, @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0") int page, @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20") diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiV2Controller.java b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiV2Controller.java index 9f41916c..832d54c9 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiV2Controller.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiV2Controller.java @@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; -import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -50,7 +49,7 @@ public class InferenceResultApiV2Controller { @Parameter(description = "비교년도 분류", example = "waste") @RequestParam(required = false) String compareClass, @Parameter(description = "5000:1 도협번호 37801011,37801012") @RequestParam(required = false) - List mapSheetNum, + Long mapSheetNum, @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0") int page, @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20") diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java index 25ce3ec5..b0cbb278 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java @@ -384,7 +384,7 @@ public class InferenceDetailDto { // 비교년도 private String compareClass; // 분석도엽 - private List mapSheetNum; + private Long mapSheetNum; // 페이징 파라미터 private int page = 0; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetAnalDataInferenceRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetAnalDataInferenceRepositoryImpl.java index f6c1190c..9e8d203f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetAnalDataInferenceRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetAnalDataInferenceRepositoryImpl.java @@ -1,5 +1,6 @@ package com.kamco.cd.kamcoback.postgres.repository.Inference; +import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto; @@ -252,9 +253,9 @@ public class MapSheetAnalDataInferenceRepositoryImpl } // 분석도엽 - if (searchGeoReq.getMapSheetNum() != null && !searchGeoReq.getMapSheetNum().isEmpty()) { - List mapSheetNum = searchGeoReq.getMapSheetNum(); - builder.and(MapSheetAnalDataInferenceGeomEntity.mapSheetNum.in(mapSheetNum)); + if (searchGeoReq.getMapSheetNum() != null) { + Long mapSheetNum = searchGeoReq.getMapSheetNum(); + builder.and(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.like("%" + mapSheetNum + "%")); } List content = @@ -368,8 +369,8 @@ public class MapSheetAnalDataInferenceRepositoryImpl } private BooleanExpression containsMapSheetNum( - QMapSheetAnalDataInferenceGeomEntity detectedEntity, List mapSheet) { - if (mapSheet == null || mapSheet.isEmpty()) { + QMapSheetAnalDataInferenceGeomEntity detectedEntity, Long mapSheet) { + if (mapSheet == null) { return null; } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java index 9038d6d5..7c249633 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java @@ -391,9 +391,9 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto } // 분석도엽 - if (searchGeoReq.getMapSheetNum() != null && !searchGeoReq.getMapSheetNum().isEmpty()) { - List mapSheetNum = searchGeoReq.getMapSheetNum(); - builder.and(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.in(mapSheetNum)); + if (searchGeoReq.getMapSheetNum() != null) { + Long mapSheetNum = searchGeoReq.getMapSheetNum(); + builder.and(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.like("%" + mapSheetNum + "%")); } List content =