From 3ac28ed8a8d76759e3641bb9445d67763d786568 Mon Sep 17 00:00:00 2001 From: thkim Date: Tue, 11 Nov 2025 15:07:24 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B0=80=20=EC=9E=90=EC=8B=A0?= =?UTF-8?q?=EC=9D=98=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=A7=8C=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=EB=90=98=EB=8F=84=EB=A1=9D=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 --- .../home/service/DrillingHomeService.java | 2 +- .../service/impl/DrillingHomeServiceImpl.java | 6 +++++- .../geoinfo/map/left/MapLeftController.java | 10 +++++----- .../left/service/impl/MapLeftServiceImpl.java | 1 - .../sqlmap/mapper/map/MapCoordSearch_SQL.xml | 9 +++++++++ .../sqlmap/mapper/map/MapLeft_SQL.xml | 19 ++++++++++++++----- .../mapper/map/MapProjectSearch_SQL.xml | 9 +++++++++ src/main/webapp/js/map/main/left/left.js | 17 ++++++++++++++++- 8 files changed, 59 insertions(+), 14 deletions(-) diff --git a/src/main/java/geoinfo/drilling/home/service/DrillingHomeService.java b/src/main/java/geoinfo/drilling/home/service/DrillingHomeService.java index 449118c9..64b13c85 100644 --- a/src/main/java/geoinfo/drilling/home/service/DrillingHomeService.java +++ b/src/main/java/geoinfo/drilling/home/service/DrillingHomeService.java @@ -10,5 +10,5 @@ public interface DrillingHomeService { public List drillingMapSearchHole(String projectCode); public List drillingMapSearchHoleWithMbr(HashMap params); - public String projectCodesByProjectMasterCompanyCodeAsList(HashMap params) throws Exception; + public List projectCodesByProjectMasterCompanyCodeAsList(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/drilling/home/service/impl/DrillingHomeServiceImpl.java b/src/main/java/geoinfo/drilling/home/service/impl/DrillingHomeServiceImpl.java index be247515..8a06b729 100644 --- a/src/main/java/geoinfo/drilling/home/service/impl/DrillingHomeServiceImpl.java +++ b/src/main/java/geoinfo/drilling/home/service/impl/DrillingHomeServiceImpl.java @@ -45,7 +45,7 @@ public class DrillingHomeServiceImpl implements DrillingHomeService { } @Override - public String projectCodesByProjectMasterCompanyCodeAsList(HashMap params) throws Exception { + public List projectCodesByProjectMasterCompanyCodeAsList(HashMap params) throws Exception { if( params.get("COM_CODE") == null ) { throw new Exception("comCode 값은 필수입니다."); } @@ -59,6 +59,7 @@ public class DrillingHomeServiceImpl implements DrillingHomeService { if (projectCodes == null || projectCodes.isEmpty()) { return null; } + /* // 2. StringBuilder를 사용해 쉼표(,)로 문자열을 조합합니다. StringBuilder sb = new StringBuilder(); @@ -71,6 +72,9 @@ public class DrillingHomeServiceImpl implements DrillingHomeService { // 3. 조합된 문자열을 반환합니다. return sb.toString(); + */ + + return projectCodes; } diff --git a/src/main/java/geoinfo/map/left/MapLeftController.java b/src/main/java/geoinfo/map/left/MapLeftController.java index 080f1d31..733628ef 100644 --- a/src/main/java/geoinfo/map/left/MapLeftController.java +++ b/src/main/java/geoinfo/map/left/MapLeftController.java @@ -328,16 +328,16 @@ public class MapLeftController { // 발주기관 프로젝트 코드만 조회 String masterCompanyCode = null; - String masterCompanyProjectCodes = null; + List masterCompanyProjectCodes = null; if( params.get("masterCompanyCode") != null ) { masterCompanyCode = GeoinfoCommon.parseData(params.get("masterCompanyCode").toString().trim()); - HashMap paramsMasterCompanyCode = new HashMap(); - paramsMasterCompanyCode.put("COM_CODE", masterCompanyCode); - masterCompanyProjectCodes = drillingHomeService.projectCodesByProjectMasterCompanyCodeAsList(paramsMasterCompanyCode); + //HashMap paramsMasterCompanyCode = new HashMap(); + //paramsMasterCompanyCode.put("COM_CODE", masterCompanyCode); + //masterCompanyProjectCodes = drillingHomeService.projectCodesByProjectMasterCompanyCodeAsList(paramsMasterCompanyCode); params.put("masterCompanyCode", masterCompanyCode); - params.put("masterCompanyProjectCodes", masterCompanyProjectCodes); + //params.put("masterCompanyProjectCodes", masterCompanyProjectCodes); } diff --git a/src/main/java/geoinfo/map/left/service/impl/MapLeftServiceImpl.java b/src/main/java/geoinfo/map/left/service/impl/MapLeftServiceImpl.java index bbf6278d..10ec2a72 100644 --- a/src/main/java/geoinfo/map/left/service/impl/MapLeftServiceImpl.java +++ b/src/main/java/geoinfo/map/left/service/impl/MapLeftServiceImpl.java @@ -55,7 +55,6 @@ public class MapLeftServiceImpl implements MapLeftService{ @Override public List getAllAreaSearchList(Map params) throws Exception { - params.get(""); return mapLeftMapper.getAllAreaSearchList(params); } diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml index 2f438ddc..4f1a7962 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml @@ -15,6 +15,11 @@ 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE ]]> + + + AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode} + + A.PROJECT_CODE = B.PROJECT_CODE + + AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode} + + 'N' ]]> + + AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode} + + = C.MINX AND B.HOLE_LOCATION_TM_X <= C.MAXX) @@ -61,6 +65,10 @@ NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE AND NVL(A.USE_YN,' ') <> 'N' ]]> + + + AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode} + 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE AND NVL(A.USE_YN,' ') <> 'N' ]]> - + + AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode} + + = C.MINX AND B.HOLE_LOCATION_TM_X <= C.MAXX) @@ -216,10 +227,8 @@ AND NVL(A.USE_YN,' ') <> 'N' ]]> - - + + AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode} diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapProjectSearch_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapProjectSearch_SQL.xml index fd1b5c5c..2f420010 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapProjectSearch_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/map/MapProjectSearch_SQL.xml @@ -29,6 +29,10 @@ ]]> + + AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode} + + 'N' ]]> + + + AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode} + +