From 2bf2ccc2d0ba568865305cf005f1b3a7fe7ab33f Mon Sep 17 00:00:00 2001 From: thkim Date: Tue, 14 Apr 2026 18:56:22 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=97=91=EC=85=80=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EC=8B=9C,=20=EC=8B=9C=EC=B6=94=EA=B3=B5=20=EC=A0=95=EB=B3=B4(?= =?UTF-8?q?=EA=B0=9C=EC=9A=94)=20=EC=A7=80=ED=95=98=EC=88=98=EC=9C=84?= =?UTF-8?q?=EA=B0=80=20=EC=8B=AC=EB=8F=84=20=EC=9D=B4=ED=95=98=EC=9D=B4?= =?UTF-8?q?=EB=8B=A4=20=EC=A7=80=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manageList/ManageExcelUploadProc03Controller.java | 10 ++++++++++ .../egovframework/sqlmap/mapper/regi/header.xml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java index aa4401a6..d4658c2c 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java @@ -6934,6 +6934,15 @@ public class ManageExcelUploadProc03Controller { String _holeEl = excel1Wp.get("col2",11).trim(); //표고 String _holeWl = excel1Wp.get("col3",12).trim(); //지하수위 String _holeWlUnit = excel1Wp.get("col2",12).trim(); //지하수위단위 + String _holeWlExcept = excel1Wp.get("col12",12).trim(); //지하수위가 심도 이하이다 체크여부 + + boolean isHoleWlExcept = false; + if( _holeWlExcept != null && _holeWlExcept.equalsIgnoreCase("true") ) { + isHoleWlExcept = true; + _holeWl = "0"; + _holeWlExcept = "Y"; + } + String _holeTotalDepth = excel1Wp.get("col3",13).trim(); //굴진심도 String _holeCasingDepth = excel1Wp.get("col3",14).trim(); //케이싱심도 if( _holeCasingDepth == null ) { @@ -7208,6 +7217,7 @@ public class ManageExcelUploadProc03Controller { params.put("HOLE_DATE_TO",_holeDateTo ); params.put("HOLE_EL",_holeEl ); params.put("HOLE_WL",_holeWlVal ); + params.put("HOLE_WL_EXCEPT",_holeWlExcept ); //지하수위가 심도 이하이다 체크여부 params.put("HOLE_TOTAL_DEPTH",_holeTotalDepth ); params.put("HOLE_CASING_DEPTH",_holeCasingDepth ); params.put("HOLE_DIA",_holeDia ); diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml index f0ea332b..4b746900 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml @@ -180,7 +180,7 @@ DELETE FROM TEMP_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE =#{PROJECT #{HOLE_DATE_FROM}, #{HOLE_DATE_TO}, #{HOLE_EL}, - #{HOLE_WL}, + #{HOLE_WL}, #{HOLE_TOTAL_DEPTH}, #{HOLE_CASING_DEPTH}, #{HOLE_DIA},