From e6bfd33c93f616b204e9344fed853254a053beb7 Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 11 Aug 2025 11:49:21 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80?= =?UTF-8?q?=EB=B3=84=EC=8B=9C=EC=B6=94=EC=A0=95=EB=B3=B4=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=ED=8A=B8=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0?= =?UTF-8?q?(FUR-001)=20-=20=EA=B4=80=EB=A6=AC=EC=8B=9C=EC=B6=94=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=ED=98=84=ED=99=A9=EB=B0=8F=EA=B1=B4=EC=84=A4=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EC=A1=B0=ED=9A=8C=EC=8B=9C,=20=EC=A0=84=EC=B2=B4?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=EC=9D=84=EC=9E=85=EB=A0=A5=ED=95=98=EC=A7=80?= =?UTF-8?q?=EC=95=8A=EA=B3=A0=EC=9D=BC=EB=B6=80=EB=B6=84=EB=A7=8C=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=ED=95=B4=EB=8F=84=EA=B2=80=EC=83=89=EC=9D=B4=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inquiry/DrillingInquiryController.java | 30 ------------------- .../service/DrillingInquiryMapper.java | 1 + .../impl/DrillingInquiryServiceImpl.java | 22 +++++++++++++- src/main/java/geoinfo/util/MyUtil.java | 24 +++++++++++++++ .../inquiry/DrillingInquiryMapper.xml | 28 +++++++++++++++-- 5 files changed, 71 insertions(+), 34 deletions(-) diff --git a/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java b/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java index 48e99631..47e37894 100644 --- a/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java +++ b/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java @@ -1,58 +1,28 @@ package geoinfo.drilling.inquiry; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; import java.util.Map; - -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jfree.util.Log; -import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import egovframework.rte.psl.dataaccess.util.EgovMap; -import geoinfo.com.WebConfirm; -import geoinfo.drilling.input.service.DrillingInputService; import geoinfo.drilling.inquiry.service.DrillingInquiryService; -import geoinfo.map.mapControl.service.MapControlService; -import geoinfo.regi.selectClassInfo.service.SelectClassService; -import geoinfo.regi.status.service.RegiPageService; -import geoinfo.regi.util.exportGeotechnicalPointShp2; import geoinfo.util.MyUtil; -import ictway.comm.util.parseData; -import ictway.comm.util.strUtil; -import ictway.comm.web.WebUtil; -import ictway.whois.whoisSMS; @Controller public class DrillingInquiryController { diff --git a/src/main/java/geoinfo/drilling/inquiry/service/DrillingInquiryMapper.java b/src/main/java/geoinfo/drilling/inquiry/service/DrillingInquiryMapper.java index 60b2faa9..184d0ab9 100644 --- a/src/main/java/geoinfo/drilling/inquiry/service/DrillingInquiryMapper.java +++ b/src/main/java/geoinfo/drilling/inquiry/service/DrillingInquiryMapper.java @@ -12,6 +12,7 @@ public interface DrillingInquiryMapper { public Long sPCntTblCsiByKeyword(HashMap params) throws SQLException; public List spGetTblCsiByKeyword(HashMap params) throws SQLException; + public String getComCodes(HashMap params) throws SQLException; public String spGetConstCompanyName(Long constCompanyCode) throws SQLException; public String spGetProjectMbr(HashMap params) throws SQLException; public List drillingInquiryAutocompleteList(HashMap params) throws SQLException; diff --git a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java index d9147b32..1f96c765 100644 --- a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java +++ b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java @@ -70,12 +70,32 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { try { try { + String keyName = "constName"; + params.put(keyName, MyUtil.removeBlank( params.get(keyName) )); + + keyName = "constCompanyAdmin"; + params.put(keyName, MyUtil.removeBlank( params.get(keyName) )); + + keyName = "constCompanyTel"; + params.put(keyName, MyUtil.removeBlank( params.get(keyName) )); + + keyName = "constCompanyName"; + params.put(keyName, MyUtil.removeBlank( params.get(keyName) )); + + keyName = "constComCodes"; + if( params.get("constCompanyName") != null && !MyUtil.getStringFromObject(params.get("constCompanyName")).trim().isEmpty() ) { + params.put(keyName, drillingInquiryMapper.getComCodes(params)); + } else { + params.put(keyName, null); + } + + Long count = drillingInquiryMapper.sPCntTblCsiByKeyword(params); List datas = drillingInquiryMapper.spGetTblCsiByKeyword(params); - String constStateCodeKey = "constStateCode"; + String constStateCodeKey = "constStateCode"; String constCompanyCodeKey = "constCompanyCode"; String projectStateCodeKey = "projectStateCode"; String crtDtKey = "crtDt"; diff --git a/src/main/java/geoinfo/util/MyUtil.java b/src/main/java/geoinfo/util/MyUtil.java index ff272800..87e44a0c 100644 --- a/src/main/java/geoinfo/util/MyUtil.java +++ b/src/main/java/geoinfo/util/MyUtil.java @@ -847,5 +847,29 @@ public final class MyUtil { return params; } + /** + * 문자열의 공백을 제거 후 return한다 + * @param target 공백을 제거할 대상 + * @return + * @throws Exception + */ + public static String removeBlank( Object target ) throws Exception { + + String str = getStringFromObject( target ); + + if( str != null ) { + str = str.replaceAll("\\s", ""); + } + + return str; + } + + public static String removeBlank( String target ) throws Exception { + return removeBlank( (Object) target ); + } + + + + } diff --git a/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml b/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml index f93f3e66..8e56bcff 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml @@ -16,6 +16,7 @@ #{masterCompanyThCode, jdbcType=VARCHAR}, #{masterCompanyName, jdbcType=VARCHAR}, #{constCompanyName, jdbcType=VARCHAR}, + #{constComCodes, jdbcType=VARCHAR}, #{constCompanyAdmin, jdbcType=VARCHAR}, #{constCompanyTel, jdbcType=VARCHAR}, NULL @@ -24,12 +25,33 @@ + +