feat: 발주지관_지도_최적화1

list.txt

@@ -7,5 +7,3 @@ src\main\resources\egovframework\egovProps\globals.properties
 src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp
 
 
-src\main\webapp\WEB-INF\views\map\left\mapLeft.jsp
-src\main\webapp\js\map\main\map.js

src/main/java/geoinfo/drilling/home/DrillingHomeController.java

@@ -12,6 +12,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -39,6 +40,7 @@ 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 org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import egovframework.rte.psl.dataaccess.util.EgovMap;
 import geoinfo.com.WebConfirm;
@@ -50,6 +52,7 @@ 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.MobileCertificationUtil;
 import geoinfo.util.MyUtil;
 import ictway.comm.util.parseData;
 import ictway.comm.util.strUtil;
@@ -151,6 +154,81 @@ public class DrillingHomeController {
 		return "jsonView";
 	}
 	
+	@RequestMapping(value = "/drilling/topMenuSelect.do")
+	public String memberRegi(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+		if(request.getSession().getAttribute("USERNAME") == null){
+			return "isError";
+		}
+
+		model.put("userName", String.valueOf(request.getSession().getAttribute("USERNAME")));
+		model.put("cls", String.valueOf(request.getSession().getAttribute("CLS")));
+		model.put("companyName", request.getSession().getAttribute("COMPANYNAME"));
+		
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("userid", String.valueOf(request.getSession().getAttribute("USERID")));
+
+		model.put("isFromDrillingSystem", false);
+
+
+		
+		return "/home/center_01";
+	}
+	
+	// 상단 메뉴 선택
+	@RequestMapping(value = "/drilling/top-menu-select.do")
+	public ModelAndView drillingTopMenuSelect(@RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response, @RequestParam("url") String url,
+			RedirectAttributes rda) throws Exception
+	{
+		ModelAndView mv = new ModelAndView();
+		
+		Enumeration<String> enumeration = request.getSession().getAttributeNames();
+
+	    while (enumeration.hasMoreElements()) {
+	      String attributeName = enumeration.nextElement();
+	      System.out.println(attributeName);
+	    }
+	    
+		if (request.getSession().getAttribute("USERID") == null)
+		{
+			// login 아래 btn 설정 html
+			mv.addObject("isLogin", false);     
+			int joinsearchIndex = url.indexOf("joinsearch");
+			int joinIndex = url.indexOf("join");
+			int pwsearchIndex = url.indexOf("pwsearch");
+			
+			if( joinsearchIndex == -1 && joinIndex == -1 && pwsearchIndex == -1) {
+				mv.addObject("msg", "로그인이 필요한 시버스입니다.");
+			}
+			
+		}else {
+			mv.addObject("isLogin", true);
+		}
+		
+		String userId = "";
+		String eGovUrl = "";
+
+		if (url.equals("center")) {
+			mv.addObject("isFromDrillingSystem", false);
+			mv.setViewName("/drilling/home/center");
+		}
+
+		mv.addObject("userid", request.getSession().getAttribute("USERID"));
+		mv.addObject("username", request.getSession().getAttribute("USERNAME"));
+		mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME"));
+		mv.addObject("url", url);
+		mv.addObject("cls", request.getSession().getAttribute("CLS"));		
+		
+		mv.addObject("partname", request.getSession().getAttribute("PARTNNAME"));
+		mv.addObject("phone", request.getSession().getAttribute("PHONE"));
+		mv.addObject("email", request.getSession().getAttribute("EMAIL"));
+		
+		mv.addObject("eGovUrl", eGovUrl);
+
+		return mv;
+	}
+	
 	
 	
 }

src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java

@@ -139,19 +139,21 @@ public class DrillingInputServiceImpl implements DrillingInputService {
 			*/
 			
 			EgovMap tbl = drillingInputMapper.getItemByCid( params );
-			
+			if( tbl != null ) {				
-			HashMap<String, Object> updateProjectCodeParams = new HashMap<String, Object>();
+				HashMap<String, Object> updateProjectCodeParams = new HashMap<String, Object>();
-			
+				
-			updateProjectCodeParams.put("userId", userId);
+				updateProjectCodeParams.put("userId", userId);
-			updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE"));
+				updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE"));
-			updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE"));   
+				updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE"));   
-			updateProjectCodeParams.put("CID", params.get("CID"));
+				updateProjectCodeParams.put("CID", params.get("CID"));
-			
+				
-			int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByCid(updateProjectCodeParams);
+				int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByCid(updateProjectCodeParams);
-			if( nResult == 0 ) {
+				if( nResult == 0 ) {
-				if( tbl.get("projectCode") != null && !tbl.get("projectCode").equals(params.get("PROJECT_CODE")) ) {
+					if( tbl.get("projectCode") != null && !tbl.get("projectCode").equals(params.get("PROJECT_CODE")) ) {
-					throw new Exception( "해당 프로젝트는 이미 다른 프로젝트와 연결되어 있습니다." );
+						throw new Exception( "해당 프로젝트는 이미 다른 프로젝트와 연결되어 있습니다." );
+					}
 				}
+				
 			}
 			return params;
 		} catch (SQLException e) {
@@ -170,18 +172,20 @@ public class DrillingInputServiceImpl implements DrillingInputService {
 		try {
 			
 			EgovMap tbl = drillingInputMapper.getItemByCid( params );
-			
+			if( tbl != null ) {
-			HashMap<String, Object> updateProjectCodeParams = new HashMap<String, Object>();
+				
-			
+				HashMap<String, Object> updateProjectCodeParams = new HashMap<String, Object>();
-			updateProjectCodeParams.put("userId", userId);
+				
-			updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE"));
+				updateProjectCodeParams.put("userId", userId);
-			updateProjectCodeParams.put("WHERE_PROJECT_CODE", params.get("WHERE_PROJECT_CODE"));
+				updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE"));
-			updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE"));   
+				updateProjectCodeParams.put("WHERE_PROJECT_CODE", params.get("WHERE_PROJECT_CODE"));
-			updateProjectCodeParams.put("CID", params.get("CID"));
+				updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE"));   
-						
+				updateProjectCodeParams.put("CID", params.get("CID"));
-			
+							
-			int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByProjectCode(updateProjectCodeParams);
+				
-			if( nResult == 0 ) {
+				int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByProjectCode(updateProjectCodeParams);
+				if( nResult == 0 ) {
+				}				
 			}
 			return params;
 		} catch (SQLException e) {

src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java

@@ -117,7 +117,7 @@ public class DrillingInquiryController {
        HttpServletResponse response
     ) {
 
-        System.out.println(
+    	System.out.println(
             "\n--------------------------------------------------------------\n" +
             request.getRequestURI() + " IN:" +
             "\n--------------------------------------------------------------\n" +

src/main/java/geoinfo/main/main/MainController.java

@@ -164,6 +164,14 @@ public class MainController
 	{
 		ModelAndView mv = new ModelAndView();
 		
+		String src = request.getParameter("src");
+		
+		if( src != null && src.toLowerCase().equals("drilling") ) {
+			mv.addObject("isFromDrillingSystem", true);
+		} else {
+			mv.addObject("isFromDrillingSystem", false);
+		}
+		
 		Enumeration<String> enumeration = request.getSession().getAttributeNames();
 
 	    while (enumeration.hasMoreElements()) {
@@ -183,7 +191,7 @@ public class MainController
 				mv.addObject("msg", "로그인이 필요한 시버스입니다.");
 			}
 			
-		}else {
+		} else {
 			mv.addObject("isLogin", true);
 
 			if ("admin_user".equals(request.getSession().getAttribute("USERID").toString()) == true) {
@@ -284,8 +292,6 @@ public class MainController
 		}
 		else if (url.equals("noticeView"))
 		{
-			//eGovUrl = "noticeView.do?idx=" + String.valueOf(params.get("idx"));
-			//mv.setViewName("home/main.jsp?url=/body/notice/notice");
 			eGovUrl = "noticeView.do";
 			mv.setViewName("home/main.jsp?url=/body/notice/noticeView");
 		}
@@ -447,7 +453,8 @@ public class MainController
 
 				mv.addObject("hdnCertNum", hdnCertNum);
 				mv.addObject("hdnCertification", hdnCertification);
-				mv.addObject("userid", userId);
+
+
 
 				mv.setViewName("home/main.jsp?url=/body/mypage/passch");
 			}

src/main/java/geoinfo/regi/info/InfoController.java

@@ -54,7 +54,7 @@ public class InfoController {
 	@Resource(name = "infoService")
 	private InfoService infoService;
 	
-	@Autowired
+	@Resource(name = "drillingInquiryService")
     DrillingInquiryService drillingInquiryService;
 
 /*  20231223 트랜젝션 중복문제로 제거

src/main/java/geoinfo/regi/projectList/ProjectListController.java

@@ -43,7 +43,7 @@ public class ProjectListController {
 	@Resource(name = "headerService")
 	private HeaderService headerService;
 
-	@Autowired
+	@Resource(name = "drillingInquiryService")
 	private DrillingInquiryService drillingInquiryService;
 	
 	@Autowired

src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard.jsp

@@ -44,24 +44,35 @@
 					<c:forEach items="${rows}" var="row">
 					<tr>
 						<td>${row.idx}</td>
-						<%-- <td class="t-left"><a href="cmuboard_read.do?id=${row.idx}" class="int" onfocus="this.blur()">${row.subject}</a></td> --%>
 						<c:choose>
 							<c:when test="${row.replygbn eq 'R'}">
-								<td class="t-left table-reply">
+								<td class="t-left table-reply">									
-									<a href="#" onClick="gourlId('cmuboard_read','${row.idx}');" class="int" onfocus="this.blur()">${row.subject}</a>
+									  <c:choose>
-									<%-- <a href="javascript:cmuDetail('${row.idx }');">${row.subject}</a> --%>
+									    <c:when test="${not isFromDrillingSystem}">
+									        <a href="#" onClick="gourlId('cmuboard_read','${row.idx}');" class="int" onfocus="this.blur()">${row.subject}</a>
+									    </c:when>
+									    <c:otherwise>
+									    	<a href="#" onClick="gourlId('cmuboard_read','${row.idx}', 'drilling');" class="int" onfocus="this.blur()">${row.subject}</a>
+									    </c:otherwise>
+									  </c:choose>
 								</td>
 							</c:when>
 							<c:otherwise>
-								<td class="t-left">
+								<td class="t-left">									
-									<a href="#" onClick="gourlId('cmuboard_read','${row.idx}');" class="int" onfocus="this.blur()">${row.subject}</a>
+									  <c:choose>
-									<%-- <a href="javascript:cmuDetail('${row.idx }');">${row.subject}</a> --%>
+									    <c:when test="${not isFromDrillingSystem}">
+									        <a href="#" onClick="gourlId('cmuboard_read','${row.idx}');" class="int" onfocus="this.blur()">${row.subject}</a>
+									    </c:when>
+									    <c:otherwise>
+									    	<a href="#" onClick="gourlId('cmuboard_read','${row.idx}', 'drilling');" class="int" onfocus="this.blur()">${row.subject}</a>
+									    </c:otherwise>
+									  </c:choose>
 								</td>
 							</c:otherwise>
 						</c:choose>
 						<td>${row.name}</td>
 						<td>${row.datetime}</td>
-						<td>${row.readcount}</td>
+						<td>${row.readcount}</td>	
 					</tr>
 					</c:forEach>
 				</tbody>
@@ -97,7 +108,18 @@
 
 <!-- 버튼그룹 시작 -->
 <div class="table-bottom-btn-group">
-	<a href="#" onclick="gourl('cmuboard_write')"><img src="./images/community/cus_bnt_write.gif" align="absmiddle" alt="글쓰기"></a>
+		  <c:choose>
+		    <c:when test="${not isFromDrillingSystem}">
+				<a href="#" onclick="gourl('cmuboard_write')">
+					<img src="./images/community/cus_bnt_write.gif" align="absmiddle" alt="글쓰기">
+				</a>
+		    </c:when>
+		    <c:otherwise>
+				<a href="#" onclick="gourl('cmuboard_write', 'drilling')">
+					<img src="./images/community/cus_bnt_write.gif" align="absmiddle" alt="글쓰기">
+				</a>
+		    </c:otherwise>
+		  </c:choose>
 </div>
 <!-- 버튼그룹 끝 -->
 

src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard_read.jsp

@@ -1,4 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <!-- 그리드 시작 -->
 <div class="contents-row">
@@ -50,8 +53,15 @@
 
 <!-- 버튼그룹 시작 -->
 <div class="table-bottom-btn-group">
-	<!-- <a href="cmuboard.do?page=0"><img src="./images/community/cus_bnt_list.gif" width="52" height="21" border="0" align="absmiddle" alt="list"></a> -->
+    <c:choose>
-	<a href="#" onclick="gourl('cmuboard')"><img src="./images/community/cus_bnt_list.gif" align="absmiddle" alt="list"></a>
+	    <c:when test="${not isFromDrillingSystem}">
+	        <a href="#" onclick="gourl('cmuboard')"><img src="./images/community/cus_bnt_list.gif" align="absmiddle" alt="list"></a>
+	    </c:when>
+	    <c:otherwise>
+	        <a href="#" onclick="gourl('cmuboard', 'drilling')"><img src="./images/community/cus_bnt_list.gif" align="absmiddle" alt="list"></a>
+	    </c:otherwise>
+	</c:choose>
+  
 	<!-- BLOCK REPLY (ON) -->
 	${EDIT_BTN}
 	<%-- ${RE_BTN} --%> <!-- 202007 삭제 -->

src/main/webapp/WEB-INF/views/body/notice/notice.jsp

@@ -5,16 +5,26 @@
 <script language=JavaScript src="${pageContext.request.contextPath}/js/common/common.js"></script>
 <script type="text/javascript">
 
-	function pageIndexLink(index){
+	function pageIndexLink(index, src) {
+		var documentFrmAction = "topMenuSelect.do?url=notice";
+		if( src ) {
+			documentFrmAction += "&" + "src=" + src;
+		}
+		
 		index = XSSCheck(index);
 		document.frm.pageIndex.value = index;
-		document.frm.action =  "topMenuSelect.do?url=notice";
+		document.frm.action = documentFrmAction;
 		document.frm.submit();
 	}
 
-	function noticeDetail(idx){
+	function noticeDetail(idx, src) {
-		document.frm.idx.value = idx;
+		var documentFrmAction = "topMenuSelect.do?url=noticeView";
-		document.frm.action =  "topMenuSelect.do?url=noticeView";
+		if( src ) {
+			documentFrmAction += "&" + "src=" + src;
+		}
+		
+		document.frm.idx.value = idx;		
+		document.frm.action = documentFrmAction;
 		document.frm.submit();
 	}
 
@@ -48,7 +58,15 @@
 					<tr>
 						<td>${resultList.idx }</td>
 						<td class="t-left">
-							<a href="javascript:noticeDetail('${resultList.idx }');"> <c:if test="${resultList.top eq 'Y' }"><font color='red'>[중요] </font></c:if> ${resultList.subject }</a>
+							
+						    <c:choose>
+							    <c:when test="${not isFromDrillingSystem}">
+							        <a href="javascript:noticeDetail('${resultList.idx }');"> <c:if test="${resultList.top eq 'Y' }"><font color='red'>[중요] </font></c:if> ${resultList.subject }</a>
+							    </c:when>
+							    <c:otherwise>
+							        <a href="javascript:noticeDetail('${resultList.idx }', 'drilling');"> <c:if test="${resultList.top eq 'Y' }"><font color='red'>[중요] </font></c:if> ${resultList.subject }</a>
+							    </c:otherwise>
+							</c:choose>
 						</td>
 						<%-- <td class="t-left">
 							<a href="#" onClick="gourlId('noticeView','${resultList.idx}');" class="int" onfocus="this.blur()"> <c:if test="${resultList.top eq '1' }"><font color='red'>[공지] </font></c:if> ${resultList.subject}</a>

src/main/webapp/WEB-INF/views/body/notice/noticeView.jsp

@@ -4,8 +4,13 @@
 
 <script type="text/javascript">
 
-	function noticeList(){
+	function noticeList(src){
-		document.frm.action =  "topMenuSelect.do?url=notice";
+		var documentFrmAction = "topMenuSelect.do?url=notice";
+		if( src ) {
+			documentFrmAction += "&" + "src=" + src;
+		}
+		
+		document.frm.action =  documentFrmAction;
 		document.frm.submit();
 	}
 
@@ -56,8 +61,15 @@
 	<!-- 그리드 끝 -->
 
 	<!-- 버튼그룹 시작 -->
-	<div class="table-bottom-btn-group">
+	<div class="table-bottom-btn-group">		
-		<a href="javascript:noticeList();"><img src="./images/cus_bnt_list.gif"></a>
+		<c:choose>
+		    <c:when test="${not isFromDrillingSystem}">
+		        <a href="javascript:noticeList();"><img src="./images/cus_bnt_list.gif"></a>
+		    </c:when>
+		    <c:otherwise>
+		        <a href="javascript:noticeList('drilling');"><img src="./images/cus_bnt_list.gif"></a>
+		    </c:otherwise>
+		</c:choose>
 	</div>
 	<!-- 버튼그룹 끝 -->
 

src/main/webapp/WEB-INF/views/body/pds/pds.jsp

@@ -5,16 +5,26 @@
 <script language=JavaScript src="${pageContext.request.contextPath}/js/common/common.js"></script>
 <script type="text/javascript">
 
-	function pageIndexLink(index){
+	function pageIndexLink(index, src) {
+		var documentFrmAction = "topMenuSelect.do?url=pds";
+		if( src ) {
+			documentFrmAction += "&" + "src=" + src;
+		}
+		
 		index = XSSCheck(index);
 		document.frm.pageIndex.value = index;
-		document.frm.action =  "topMenuSelect.do?url=pds";
+		document.frm.action =  documentFrmAction;
 		document.frm.submit();
 	}
 
-	function dataDetail(idx){
+	function dataDetail(idx, src) {
+		var documentFrmAction = "topMenuSelect.do?url=pdsView";
+		if( src ) {
+			documentFrmAction += "&" + "src=" + src;
+		}
+		
 		document.frm.idx.value = idx;
-		document.frm.action =  "topMenuSelect.do?url=pdsView";
+		document.frm.action =  documentFrmAction;
 		document.frm.submit();
 	}
 
@@ -62,7 +72,17 @@
 					<c:forEach items="${resultList}" var="resultList">
 					<tr>
 						<td>${resultList.idx }</td>
-						<td class="t-left"><a href="javascript:dataDetail('${resultList.idx }');"> <c:if test="${resultList.top eq '1' }"><font color='red'>[공지] </font></c:if> ${resultList.subject }</a></td>
+						<td class="t-left">
+							<c:choose>
+							    <c:when test="${not isFromDrillingSystem}">
+							        <a href="javascript:dataDetail('${resultList.idx }');"> <c:if test="${resultList.top eq '1' }"><font color='red'>[공지] </font></c:if> ${resultList.subject }</a>
+							    </c:when>
+							    <c:otherwise>
+							    	<a href="javascript:dataDetail('${resultList.idx }', 'drilling');"> <c:if test="${resultList.top eq '1' }"><font color='red'>[공지] </font></c:if> ${resultList.subject }</a>
+							    </c:otherwise>
+							</c:choose>
+							
+						</td>
 						<td>${resultList.author }</td>
 						<td>${resultList.datetime }</td>
 					</tr>
@@ -78,26 +98,54 @@
 		<table id="Table_Result" class="table-paging table-paging-pds">
 			<tr>
 				<td align=center>
-					<a href="javascript:pageIndexLink('${paginationInfo.firstPageNoOnPageList }');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
+					<c:choose>
-						<i class="fa fa-angle-double-left icon-medium" aria-hidden="true"></i>
+					    <c:when test="${not isFromDrillingSystem}">
-					</a>
+					        <a href="javascript:pageIndexLink('${paginationInfo.firstPageNoOnPageList }');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
-					<a href="javascript:pageIndexLink('${paginationInfo.currentPageNo-1 }');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
+								<i class="fa fa-angle-double-left icon-medium" aria-hidden="true"></i>
-						<i class="fa fa-angle-left icon-very-medium" aria-hidden="true"></i>
+							</a>
-					</a>
+							<a href="javascript:pageIndexLink('${paginationInfo.currentPageNo-1 }');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
-					<c:forEach begin="${paginationInfo.firstPageNoOnPageList }" end="${paginationInfo.lastPageNoOnPageList }" var="i">
+								<i class="fa fa-angle-left icon-very-medium" aria-hidden="true"></i>
-
+							</a>
-						<c:if test="${paginationInfo.currentPageNo eq i }"><span class="navi_cur" style="display: none;"></span></c:if>
+							<c:forEach begin="${paginationInfo.firstPageNoOnPageList }" end="${paginationInfo.lastPageNoOnPageList }" var="i">
-						<a href="javascript:pageIndexLink('${ i }');" class="navi">
+		
-							${ i }
+								<c:if test="${paginationInfo.currentPageNo eq i }"><span class="navi_cur" style="display: none;"></span></c:if>
-						</a>
+								<a href="javascript:pageIndexLink('${ i }');" class="navi">
-
+									${ i }
-					</c:forEach>
+								</a>
-					<a href="javascript:pageIndexLink('${paginationInfo.currentPageNo+1 }');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
+		
-						<i class="fa fa-angle-right icon-very-medium" aria-hidden="true"></i>
+							</c:forEach>
-					</a>
+							<a href="javascript:pageIndexLink('${paginationInfo.currentPageNo+1 }');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
-					<a href="javascript:pageIndexLink('${paginationInfo.lastPageNoOnPageList }');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
+								<i class="fa fa-angle-right icon-very-medium" aria-hidden="true"></i>
-						<i class="fa fa-angle-double-right icon-medium" aria-hidden="true"></i>
+							</a>
-					</a>
+							<a href="javascript:pageIndexLink('${paginationInfo.lastPageNoOnPageList }');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
+								<i class="fa fa-angle-double-right icon-medium" aria-hidden="true"></i>
+							</a>
+					    </c:when>
+					    <c:otherwise>
+					    	<a href="javascript:pageIndexLink('${paginationInfo.firstPageNoOnPageList }', 'drilling');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
+								<i class="fa fa-angle-double-left icon-medium" aria-hidden="true"></i>
+							</a>
+							<a href="javascript:pageIndexLink('${paginationInfo.currentPageNo-1 }', 'drilling');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
+								<i class="fa fa-angle-left icon-very-medium" aria-hidden="true"></i>
+							</a>
+							<c:forEach begin="${paginationInfo.firstPageNoOnPageList }" end="${paginationInfo.lastPageNoOnPageList }" var="i">
+		
+								<c:if test="${paginationInfo.currentPageNo eq i }"><span class="navi_cur" style="display: none;"></span></c:if>
+								<a href="javascript:pageIndexLink('${ i }', 'drilling');" class="navi">
+									${ i }
+								</a>
+		
+							</c:forEach>
+							<a href="javascript:pageIndexLink('${paginationInfo.currentPageNo+1 }', 'drilling');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
+								<i class="fa fa-angle-right icon-very-medium" aria-hidden="true"></i>
+							</a>
+							<a href="javascript:pageIndexLink('${paginationInfo.lastPageNoOnPageList }', 'drilling');" class="btn btn-small btn-transparent-dark-gray btn-rounded md-margin-15px-bottom sm-display-table sm-margin-lr-auto">
+								<i class="fa fa-angle-double-right icon-medium" aria-hidden="true"></i>
+							</a>
+					    </c:otherwise>
+					</c:choose>
+							
+					
 				</td>
 			</tr>
 		</table>

src/main/webapp/WEB-INF/views/body/pds/pdsView.jsp

@@ -5,8 +5,13 @@
 
 <script type="text/javascript">
 
-	function dataList(){
+	function dataList(src){
-		document.frm.action =  "topMenuSelect.do?url=pds";
+		var documentFrmAction = "topMenuSelect.do?url=pds";
+		if( src ) {
+			documentFrmAction += "&" + "src=" + src;
+		}
+		
+		document.frm.action =  documentFrmAction;
 		document.frm.submit();	
 	}
 
@@ -77,8 +82,15 @@
 	<!-- 그리드 끝 -->
 
 	<!-- 버튼그룹 시작 -->
-	<div class="table-bottom-btn-group">
+	<div class="table-bottom-btn-group">		
-		<a href="javascript:dataList();"><img src="./images/cus_bnt_list.gif"></a>
+		<c:choose>
+		    <c:when test="${not isFromDrillingSystem}">
+		        <a href="javascript:dataList();"><img src="./images/cus_bnt_list.gif"></a>
+		    </c:when>
+		    <c:otherwise>
+		    	<a href="javascript:dataList('drilling');"><img src="./images/cus_bnt_list.gif"></a>
+		    </c:otherwise>
+		</c:choose>
 	</div>
 	<!-- 버튼그룹 끝 -->
 

src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp

@@ -61,90 +61,17 @@
                     <!-- gnb -->
                     <nav class="gnb" id="gnb">
                         <ul>
-                            <li class="">
+                        	<li class="">
-                                <a href='javascript:void(0);' onclick="onClickBtnViewOnMap()">
+                                <a href="/topMenuSelect.do?url=center&src=drilling">
-                                    지도 보기
+                                	센터소개
                                 </a>
-                                <div class="depth2_box" style="display: none;">
-                                <ul class="depth2">
-                                
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/WPGE0201/m_34849/DTL.jsp" class="has_sub">
-                                            <i>방문상담</i>
-                                            </a>
-                                                
-                                                    <ul class="depth3">		
-                                                
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/vst_mw/m_34850/lst.jsp">
-                                                            <i>방문상담신청</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                </ul>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/WPGE0201/m_15911/LST.jsp" class="has_sub">
-                                            <i>전자민원신청</i>
-                                            </a>
-                                                
-                                                    <ul class="depth3">		
-                                                
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/WPGE0201/m_15911/DTL.jsp">
-                                                            <i>전자민원신청</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/WPGE0201/m_15912/DTL.jsp">
-                                                            <i>전자민원검색</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                </ul>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/WPGE0201/m_15913/DTL.jsp">
-                                            <i>서면민원처리결과공개</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/WPGE0201/m_15914/DTL.jsp">
-                                            <i>나의민원</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/WPGE0201/m_15915/DTL.jsp">
-                                            <i>민원서식안내</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/WPGE0201/m_15916/DTL.jsp">
-                                            <i>자주하는질문</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                </ul>
-                                </div>
                             </li>
 
                             <li class="">
-                                <a href="/drilling/inquiry-project.do">
+                                <a href="/topMenuSelect.do?url=cmuboard&src=drilling">
-                                    건설 조회
+                                    	커뮤니티
                                 </a>
-                                <div class="depth2_box" style="display: none;">
+                                <div class="depth2_box">
                                 <ul class="depth2 on">
                                 
                                     <li class="">
@@ -277,7 +204,6 @@
                                             <a href="https://docu.gdoc.go.kr/" target="_blank" title="새창">
                                             <i>문서24</i>
                                             </a>
-                                                
                                     </li>
                                     
                                 </ul>
@@ -285,8 +211,8 @@
                             </li>
 
                             <li class="">
-                                <a href="/drilling/inquiry.do">
+                                <a href="/topMenuSelect.do?url=pds&src=drilling">
-                                    입력 조회
+                                	자료실
                                 </a>
                                 <div class="depth2_box" style="display: none;">
                                 <ul class="depth2">
@@ -337,271 +263,16 @@
                                 </div>
                             </li>
 
-                            <li class="">
+                            <li class="" style="display: none;">
                                 <a href="/drilling/input.do">
-                                    입력 하기
+                                	입력 하기
                                 </a>
-                                <div class="depth2_box" style="display: none;">
-                                <ul class="depth2">
-                                
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/BORD0201/m_15958/BRD.jsp">
-                                            <i>공지사항</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/BORD0201/m_15959/BRD.jsp">
-                                            <i>국토관리청공고</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/phc040301_b/m_15961/lst.jsp" class="has_sub">
-                                            <i>사업·입찰안내</i>
-                                            </a>
-                                                
-                                                    <ul class="depth3">		
-                                                
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/phc040301_b/m_15961/lst.jsp">
-                                                            <i>사업현황</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/tender/m_15962/lst.jsp">
-                                                            <i>입찰안내</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                </ul>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/BORD0201/m_21982/BRD.jsp">
-                                            <i>원주국토청 보도자료</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/N0201/m_15955/lst.jsp">
-                                            <i>국토부 보도자료</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/INSA/m_15972/lst.jsp" class="has_sub">
-                                            <i>인사/채용</i>
-                                            </a>
-                                                
-                                                    <ul class="depth3">		
-                                                
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/INSA/m_15972/lst.jsp">
-                                                            <i>인사발령</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/BORD0201/m_15974/BRD.jsp">
-                                                            <i>직원채용정보</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                </ul>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/standard/m_34928/lst.jsp">
-                                            <i>사전규격공고</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/ordinance/m_15983/lst.jsp" class="has_sub">
-                                            <i>법령자료</i>
-                                            </a>
-                                                
-                                                    <ul class="depth3">		
-                                                
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/ordinance/m_15983/lst.jsp">
-                                                            <i>법률</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/ordinance/m_15984/lst.jsp">
-                                                            <i>대통령령</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/ordinance/m_15985/lst.jsp">
-                                                            <i>부령</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/I0204/m_15986/lst.jsp">
-                                                            <i>훈령/지침/고시</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/law/m_22725/lst.jsp">
-                                                            <i>입법예고</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                </ul>
-                                                
-                                    </li>
-                                    
-                                </ul>
-                                </div>
                             </li>
 							<li class="">
                                 <a href="/logout.do?location=index">
-                                    	로그아웃
+                                	로그아웃
                                 </a>
-                                <div class="depth2_box">
-                                <ul class="depth2">
-                                
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/BORD0201/m_15958/BRD.jsp"> 
-                                            <i>공지사항</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/BORD0201/m_15959/BRD.jsp">
-                                            <i>국토관리청공고</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/phc040301_b/m_15961/lst.jsp" class="has_sub">
-                                            <i>사업·입찰안내</i>
-                                            </a>
-                                                
-                                                    <ul class="depth3">		
-                                                
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/phc040301_b/m_15961/lst.jsp">
-                                                            <i>사업현황</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/tender/m_15962/lst.jsp">
-                                                            <i>입찰안내</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                </ul>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/BORD0201/m_21982/BRD.jsp">
-                                            <i>원주국토청 보도자료</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/N0201/m_15955/lst.jsp">
-                                            <i>국토부 보도자료</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/INSA/m_15972/lst.jsp" class="has_sub">
-                                            <i>인사/채용</i>
-                                            </a>
-                                                
-                                                    <ul class="depth3">		
-                                                
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/INSA/m_15972/lst.jsp">
-                                                            <i>인사발령</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/BORD0201/m_15974/BRD.jsp">
-                                                            <i>직원채용정보</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                </ul>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/standard/m_34928/lst.jsp">
-                                            <i>사전규격공고</i>
-                                            </a>
-                                                
-                                    </li>
-                                    
-                                    <li>
-                                            <a href="https://www.molit.go.kr/wrocm/USR/ordinance/m_15983/lst.jsp" class="has_sub">
-                                            <i>법령자료</i>
-                                            </a>
-                                                
-                                                    <ul class="depth3">		
-                                                
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/ordinance/m_15983/lst.jsp">
-                                                            <i>법률</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/ordinance/m_15984/lst.jsp">
-                                                            <i>대통령령</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/ordinance/m_15985/lst.jsp">
-                                                            <i>부령</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/I0204/m_15986/lst.jsp">
-                                                            <i>훈령/지침/고시</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                    <li>
-                                                            <a href="https://www.molit.go.kr/wrocm/USR/law/m_22725/lst.jsp">
-                                                            <i>입법예고</i>
-                                                            </a>
-                                                    </li>
-                                                    
-                                                </ul>
-                                                
-                                    </li>
-                                    
-                                </ul>
-                                </div>
                             </li>
-                            
                         </ul>
                     </nav>
                     <!-- //gnb -->

src/main/webapp/WEB-INF/views/drilling/home/center.jsp

@@ -0,0 +1,17 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+
+	<%@ include file="/include/inc_head_2021_new.jsp" %>	
+	<!--  삭제 요청 20250604 1115 -->
+
+	
+<%@ include file="/include/inc_footer_2021_new.jsp" %>
+<style>
+	body {
+		background: #f9f9f9;
+	}
+	.page-container {
+		margin-top: 40px;
+	}
+</style>

src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp

@@ -75,26 +75,26 @@
 	            <div>
 	                <!-- 메뉴 서비스 -->
 	                <ul class="wrap_service">
-	                    <li class="item01"><a href='javascript:void(0);' onclick="onClickBtnViewOnMap()"><i>지도 보기</i></a></li>
+	                    <li class="item01"><a href='javascript:void(0);' onclick="onClickBtnViewOnMap()"><i>관할지도 보기</i></a></li>
-	                    <li class="item02"><a href="/drilling/inquiry-project.do"><i>건설 조회</i></a></li>
+	                    <li class="item02"><a href="/drilling/inquiry-project.do"><i>관리 시추정보 현황</i></a></li>
-	                    <li class="item03"><a href="/drilling/inquiry.do"><i>입력 조회</i></a></li>
+	                    <li class="item03"><a href="/drilling/inquiry.do"><i>건설현장 입력</i></a></li>
-	                    <li class="item04"><a href="/drilling/input.do"><i>입력 하기</i></a></li>
+	                    <li class="item04"><a href="/drilling/input.do"><i>건설현장 조회</i></a></li>
 	                </ul>
 	                <!-- //메뉴 서비스 -->
 	                
 	                <!-- 알림판 -->
 	                <div>
 	                    <div class="wrap_popzone wrap_slider">
-	                        <h3><i>최근 등록 건설현장</i></h3>
+	                        <h3><i>공지사항</i></h3>
 	
 	                    </div>
 	                    <div class="recent-datas">
 	                        <ul class="project-list">
-	                            <li class="project-list-item">부산 해운대 힐스테이트 현장</li>
+	                            <li class="project-list-item">서비스 패치로 인한 중단 예정</li>
-	                            <li class="project-list-item">세종시 나성동 블루밍 아파트 현장</li>
+	                            <li class="project-list-item">2024년 건설 시추정보 홍보 브로슈어 배포</li>
-	                            <li class="project-list-item">광주 첨단지구 푸르지오 아파트 신축공사 현장</li>
+	                            <li class="project-list-item">2023년 활용통계집 배포</li>
-	                            <li class="project-list-item">서울 강남구 역삼동 스퀘어 오피스텔 현장</li>
+	                            <li class="project-list-item">종무식 안내</li>
-	                            <li class="project-list-item">대전 유성구 봉명동 드림타워 오피스텔 현장</li>
+	                            <li class="project-list-item">시스템 패치로 인한 간헐적 중단 안내</li>
 	                        </ul>
 	                    </div>
 	                </div>
@@ -103,7 +103,7 @@
 	                <div class="wrap_greeting">
 	                    <h3>이용에 어려움이 있으신가요?</h3>
 	                    <p>본 시스템은 발주 기관의 건설현장 프로젝트 계획을 입력하는 시스템입니다. 이후 수주 기관은 입력된 프로젝트의 상세 내용을 입력합니다.</p>
-	                    <a href="https://www.youtube.com/watch?v=zhPdDH72a7U" target="_blank" class="btn_shortcut"><i>튜토리얼 보기</i></a>
+	                    <a href="https://www.youtube.com/watch?v=zhPdDH72a7U" target="_blank" class="btn_shortcut"><i>매뉴얼 보기</i></a>
 	                </div>
 	            	<!-- //튜토리얼 -->
 	            </div>

src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp

@@ -5,7 +5,6 @@
 
 <%
 
-
 if (request.getSession().getAttribute("USERID") == null) {
 
 %>
@@ -25,6 +24,8 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
 }
 %>
 
+<script src="../js/body/psboard/situTable.js"></script>
+
 
 
 <%@ include file="/include/inc_head_2021_new.jsp" %>
@@ -95,7 +96,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
 		            `
 		            <tr>
 		                <td>` + (obj.count - idx - (nCount * (nPage - 1))) + `</td>
-		                <td style="text-align: left; text-indent: 10px;">` + obj.datas[idx].constName + `</td>
+		                <td style="text-align: left; text-indent: 10px; cursor: pointer" data-project-code="` + obj.datas[idx].projectCode + `" onclick="openMapLoc('` + obj.datas[idx].projectCode + `');">` + obj.datas[idx].constName + `</td>
 		                <td>` + obj.datas[idx].projectStateCodeName + `</td>
 		                <td>` + constStartDate + ` ~ ` + constEndDate + `</td>
 		                <td>` + obj.datas[idx].constStateCodeName + `</td>
@@ -223,7 +224,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
             <div class="page-sidebar">
                 <div class="treeview-project-name">
                     <p class="project-title">건설현장 관리</p>
-                    <p class="project-value value-is-active">프로젝트 조회</p>
+                    <p class="project-value value-is-active">관리 시추정보 현황</p>
                     <p class="project-value"><a href="/drilling/inquiry.do">건설현장 조회</a></p>
                     <p class="project-value"><a href="/drilling/input.do">건설현장 입력</a></p>
                 </div>
@@ -238,12 +239,12 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
                 <div class="category-wrapper">
                     <ul class="page-category">
                         <li class="category-item"></li>
-                        <li class="category-item">프로젝트 조회</li>
+                        <li class="category-item">관리 시추정보 현황</li>
                     </ul>
                     <a href="#" class="btn btn-help">도움말</a>
                 </div>
                 <!-- 카테고리 끝 -->
-                <h1 class="page-title-1depth">프로젝트 조회</h1>
+                <h1 class="page-title-1depth">관리 시추정보 현황</h1>
                 <!-- 내용 시작 -->
                 <div class="content-wrapper">
                     <div class="content1">

src/main/webapp/WEB-INF/views/home/center_01.jsp

@@ -17,15 +17,35 @@
 		$("#center_sub_menu > li.nav-item:eq(0)").addClass("active");
 	});
 </script>
-
+<style>
+  <c:choose>
+    <c:when test="${not isFromDrillingSystem}">
+        
+    </c:when>
+    <c:otherwise>
+       .page-container {
+       	margin-top: 54px;
+       }
+    </c:otherwise>
+  </c:choose>
+</style>
 <body class="sub">
 
 	<!-- 헤더 시작 -->
-	<%@ include file="include/top.jsp" %>
+    <c:choose>
+	    <c:when test="${not isFromDrillingSystem}">
+	        <%@ include file="include/top.jsp" %>
+	    </c:when>
+	    <c:otherwise>
+	        <c:import url="/drilling/common/includeTopMenu.do" charEncoding="UTF-8" />
+	    </c:otherwise>
+	</c:choose>
 	<!-- 헤더 끝 -->
 
 	<!-- 비쥬얼 시작 -->
-	<section class="wow fadeIn parallax" data-stellar-background-ratio="0.5"></section>
+	<c:if test="${not isFromDrillingSystem}">
+		<section class="wow fadeIn parallax" data-stellar-background-ratio="0.5"></section>
+	</c:if>
 	<!-- 비쥬얼 끝 -->
 
 	<!-- 페이지 컨테이너 시작 -->

src/main/webapp/WEB-INF/views/home/center_02.jsp

@@ -15,15 +15,36 @@
 		$("#center_sub_menu > li.nav-item:eq(1)").addClass("active");
 	});
 </script>
+<style>
+  <c:choose>
+    <c:when test="${not isFromDrillingSystem}">
+        
+    </c:when>
+    <c:otherwise>
+       .page-container {
+       	margin-top: 54px;
+       }
+    </c:otherwise>
+  </c:choose>
+</style>
 
 <body class="sub">
 
 	<!-- 헤더 시작 -->
-	<%@ include file="include/top.jsp" %>
+    <c:choose>
+	    <c:when test="${not isFromDrillingSystem}">
+	        <%@ include file="include/top.jsp" %>
+	    </c:when>
+	    <c:otherwise>
+	        <c:import url="/drilling/common/includeTopMenu.do" charEncoding="UTF-8" />
+	    </c:otherwise>
+	</c:choose>
 	<!-- 헤더 끝 -->
 
 	<!-- 비쥬얼 시작 -->
-	<section class="wow fadeIn parallax" data-stellar-background-ratio="0.5"></section>
+	<c:if test="${not isFromDrillingSystem}">
+		<section class="wow fadeIn parallax" data-stellar-background-ratio="0.5"></section>
+	</c:if>
 	<!-- 비쥬얼 끝 -->
 
 	<!-- 페이지 컨테이너 시작 -->

src/main/webapp/WEB-INF/views/home/center_03.jsp

@@ -15,15 +15,36 @@
 		$("#center_sub_menu > li.nav-item:eq(2)").addClass("active");
 	});
 </script>
+<style>
+  <c:choose>
+    <c:when test="${not isFromDrillingSystem}">
+        
+    </c:when>
+    <c:otherwise>
+       .page-container {
+       	margin-top: 54px;
+       }
+    </c:otherwise>
+  </c:choose>
+</style>
 
 <body class="sub">
 
 	<!-- 헤더 시작 -->
-	<%@ include file="include/top.jsp" %>
+    <c:choose>
+	    <c:when test="${not isFromDrillingSystem}">
+	        <%@ include file="include/top.jsp" %>
+	    </c:when>
+	    <c:otherwise>
+	        <c:import url="/drilling/common/includeTopMenu.do" charEncoding="UTF-8" />
+	    </c:otherwise>
+	</c:choose>
 	<!-- 헤더 끝 -->
 
 	<!-- 비쥬얼 시작 -->
-	<section class="wow fadeIn parallax" data-stellar-background-ratio="0.5"></section>
+	<c:if test="${not isFromDrillingSystem}">
+		<section class="wow fadeIn parallax" data-stellar-background-ratio="0.5"></section>
+	</c:if>
 	<!-- 비쥬얼 끝 -->
 
 	<!-- 페이지 컨테이너 시작 -->

src/main/webapp/WEB-INF/views/home/include/left_menu.jsp

@@ -9,19 +9,46 @@
 				<h2 class="heading-title">센터소개</h2>
 			</li>
 			<li class="nav-item">
-				<a href="#" onClick="gourl('center')" onfocus="this.blur()" class="nav-link nav-toggle">
+				<c:choose>
-					<span class="title">개요</span>
+				    <c:when test="${not isFromDrillingSystem}">
-				</a>
+						<a href="#" onClick="gourl('center')" onfocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">개요</span>
+						</a>
+				    </c:when>
+				    <c:otherwise>
+				    	<a href="#" onClick="gourl('center', 'drilling')" onfocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">개요</span>
+						</a>
+				    </c:otherwise>
+				</c:choose>
 			</li>
 			<li class="nav-item">
-				<a href="#" onClick="gourl('center2')" onfocus="this.blur()" class="nav-link nav-toggle">
+				<c:choose>
-					<span class="title">주요기능</span>
+				    <c:when test="${not isFromDrillingSystem}">
-				</a>
+						<a href="#" onClick="gourl('center2')" onfocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">주요기능</span>
+						</a>
+				    </c:when>
+				    <c:otherwise>
+				    	<a href="#" onClick="gourl('center2', 'drilling')" onfocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">주요기능</span>
+						</a>
+				    </c:otherwise>
+				</c:choose>
 			</li>
-			<li class="nav-item">
+			<li class="nav-item">				
-				<a href="#" onClick="gourl('center3')" onfocus="this.blur()" class="nav-link nav-toggle">
+				<c:choose>
-					<span class="title">오시는길</span>
+				    <c:when test="${not isFromDrillingSystem}">
-				</a>
+						<a href="#" onClick="gourl('center3')" onfocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">오시는길</span>
+						</a>
+				    </c:when>
+				    <c:otherwise>
+				    	<a href="#" onClick="gourl('center3', 'drilling')" onfocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">오시는길</span>
+						</a>
+				    </c:otherwise>
+				</c:choose>
 			</li>
 		</ul>
 
@@ -84,29 +111,75 @@
 				<h2 class="heading-title">게시판</h2>
 			</li>
 			<li class="nav-item">
-				<a href="#" onClick="gourl('cmuboard')" onFocus="this.blur()" class="nav-link nav-toggle">
+				<c:choose>
-					<span class="title">커뮤니티</span>
+				    <c:when test="${not isFromDrillingSystem}">
-				</a>
+						<a href="#" onClick="gourl('cmuboard')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">커뮤니티</span>
+						</a>
+				    </c:when>
+				    <c:otherwise>
+						<a href="#" onClick="gourl('cmuboard', 'drilling')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">커뮤니티</span>
+						</a>
+				    </c:otherwise>
+				</c:choose>
 			</li>
 			<li class="nav-item">
-				<a href="#" onClick="gourl('notice')" onFocus="this.blur()" class="nav-link nav-toggle">
+				<c:choose>
-					<span class="title">공지사항</span>
+				    <c:when test="${not isFromDrillingSystem}">
-				</a>
+						<a href="#" onClick="gourl('notice')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">공지사항</span>
+						</a>
+				    </c:when>
+				    <c:otherwise>
+						<a href="#" onClick="gourl('notice', 'drilling')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">공지사항</span>
+						</a>
+				    </c:otherwise>
+				</c:choose>
 			</li>
 			<li class="nav-item">
-				<a href="#" onClick="gourl('pds')" onFocus="this.blur()" class="nav-link nav-toggle">
+				<c:choose>
-					<span class="title">자료실</span>
+				    <c:when test="${not isFromDrillingSystem}">
-				</a>
+						<a href="#" onClick="gourl('pds')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">자료실</span>
+						</a>
+				    </c:when>
+				    <c:otherwise>
+						<a href="#" onClick="gourl('pds', 'drilling')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">자료실</span>
+						</a>
+				    </c:otherwise>
+				</c:choose>
 			</li>
 			<li class="nav-item">
-				<a href="#" onClick="gourl('psboard')" onFocus="this.blur()" class="nav-link nav-toggle">
+				<c:choose>
-					<span class="title">시추정보 Q&A</span>
+				    <c:when test="${not isFromDrillingSystem}">
-				</a>
+						<a href="#" onClick="gourl('psboard')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">시추정보 Q&A</span>
+						</a>
+				    </c:when>
+				    <c:otherwise>
+						<a href="#" onClick="gourl('psboard', 'drilling')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">시추정보 Q&A</span>
+						</a>
+				    </c:otherwise>
+				</c:choose>
 			</li>
 			<li class="nav-item">
-				<a href="#" onClick="gourl('faq')" onFocus="this.blur()" class="nav-link nav-toggle">
-					<span class="title">시추정보 FAQ</span>
 				</a>
+				<c:choose>
+				    <c:when test="${not isFromDrillingSystem}">
+						<a href="#" onClick="gourl('faq')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">시추정보 FAQ</span>
+						</a>
+				    </c:when>
+				    <c:otherwise>
+						<a href="#" onClick="gourl('faq', 'drilling')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">시추정보 FAQ</span>
+						</a>
+				    </c:otherwise>
+				</c:choose>
 			</li>
 			
 			<c:if test="${isLogin == true}">

src/main/webapp/WEB-INF/views/home/main.jsp

@@ -152,16 +152,29 @@
 
 <script>
 
-	function gourl(url) {
+	function gourl(url, src) {
-		window.location.href="topMenuSelect.do?url="+url;
+		var windowLocationHref="topMenuSelect.do?url=" + url;
+		if( src ) {
+			windowLocationHref += "&" + "src=" + src;
+		}
+		window.location.href = windowLocationHref;
 	}
-	function gourlId(url, idx) {
+	
-		window.location.href="topMenuSelect.do?url="+url+"&id="+idx;
+	function gourlId(url, idx, src) {
+		var windowLocationHref="topMenuSelect.do?url="+url+"&id="+idx;
+		if( src ) {
+			windowLocationHref += "&" + "src=" + src;
+		}
+		window.location.href = windowLocationHref;
 	}
-	function gourlPage(url, idx) {
+	function gourlPage(url, idx, src) {
-		window.location.href="topMenuSelect.do?url="+url+"&page="+idx;
+		var windowLocationHref="topMenuSelect.do?url="+url+"&page="+idx;
+		if( src ) {
+			windowLocationHref += "&" + "src=" + src;
+		}
+		window.location.href = windowLocationHref;
 	}
-	function gourlPageSitu(param, page) {
+	function gourlPageSitu(param, page, src) {
 		var startDate = $("#startDate option:selected").val();
 		var endDate = $("#endDate option:selected").val();
 		var searchKey = $('#searchKey').val();
@@ -173,29 +186,57 @@
 			url = "situTable";
 		}else if(param == 2 ){
 			startDate = "1899";
-			endDate = "2024";
+			endDate = "2025";
 			url = "SearchSitu";
 		}
 		console.log('gourlPageSitu');
-		window.location.href="topMenuSelect.do?url=" + url+ "&startDate=" + startDate + "&endDate=" + endDate + "&searchKey=" + searchKey + "&page=" + page;
+		
+		var windowLocationHref="topMenuSelect.do?url=" + url+ "&startDate=" + startDate + "&endDate=" + endDate + "&searchKey=" + searchKey + "&page=" + page;
+		if( src ) {
+			windowLocationHref += "&" + "src=" + src;
+		}
+		window.location.href = windowLocationHref;
 	}
 
 
 
 </script>
 
+<style>
+  <c:choose>
+    <c:when test="${not isFromDrillingSystem}">
+        
+    </c:when>
+    <c:otherwise>
+       .page-container {
+       	margin-top: 54px;
+       }
+    </c:otherwise>
+  </c:choose>
+</style>
+
 <body class="sub">
 
 	<form name="test" method="post">
 
 		<!-- 헤더 시작 -->
-		<%@ include file="include/top.jsp" %>
+	    <c:choose>
+		    <c:when test="${not isFromDrillingSystem}">
+		        <%@ include file="include/top.jsp" %>
+		    </c:when>
+		    <c:otherwise>
+		        <c:import url="/drilling/common/includeTopMenu.do" charEncoding="UTF-8" />
+		    </c:otherwise>
+		</c:choose>
 		<!-- 헤더 끝 -->
-
+	</form>
+	
 		<!-- 비쥬얼 시작 -->
-		<section class="wow fadeIn parallax" data-stellar-background-ratio="0.5"></section>
+		<c:if test="${not isFromDrillingSystem}">
+			<section class="wow fadeIn parallax" data-stellar-background-ratio="0.5"></section>
+		</c:if>
 		<!-- 비쥬얼 끝 -->
-
+	
 		<!-- 페이지 컨테이너 시작 -->
 		<section class="page-container">
 
@@ -739,6 +780,6 @@
 		</section>
 		<!-- 페이지 컨테이너 끝 -->
 
-	</form>
+	
 
 <%@ include file="include/footer.jsp" %>

src/main/webapp/WEB-INF/views/layouts/body/cmuboard/cmuboard.jsp

@@ -1,7 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <table id="Table_Main" width="100%" border="0" cellpadding="0" cellspacing="0">
-	<!-- <20><><EFBFBD> Ÿ<><C5B8>Ʋ <20><>ũ <20><> <20>̹<EFBFBD><CCB9><EFBFBD> -->
 	<tr>
 		<td height="25" align="right" bgcolor="#eeeeee" class="notice1">→
 		<a href="index.do?cntyn=0" target="_top">Home</a> &gt; 
@@ -27,7 +26,7 @@
 	<tr>
 		<td height="20" bgcolor="#ffffff"></td>
 	</tr>
-	<!-- <20><><EFBFBD><EFBFBD>Ʈ <20><><EFBFBD><EFBFBD> -->
+
 	<tr>
 		<td>
 		<table id="Table_List" width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -83,8 +82,21 @@
 </table>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>		
+	<tr>
-		<td align="right" height="40"><a onclick="gourl('cmuboard_write')" href="#"><img src="./images/body/cmuboard/cus_bnt_write.gif" width="81" height="21"  border="0"></a></td>
+		<td align="right" height="40">
+		  <c:choose>
+		    <c:when test="${not isFromDrillingSystem}">
+				<a onclick="gourl('cmuboard_write')" href="#">
+					<img src="./images/body/cmuboard/cus_bnt_write.gif" width="81" height="21"  border="0">
+				</a>
+		    </c:when>
+		    <c:otherwise>
+				<a onclick="gourl('cmuboard_write', 'drilling')" href="#">
+					<img src="./images/body/cmuboard/cus_bnt_write.gif" width="81" height="21"  border="0">
+				</a>
+		    </c:otherwise>
+		  </c:choose>
+		</td>
     </tr>	
 
 	<tr height=42>

src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp

@@ -1287,9 +1287,10 @@ function table3display(){
 
 			// 트리메뉴
 			$("#browser").treeview();
-			// thkim
+			
-			console.log( 'thkim:' + getQueryString("masterCompanyCode") );
+			if( !getQueryString("masterCompanyCode") ) {
-			autocomplete();
+				autocomplete();
+			}
 
 
 		});
@@ -1336,7 +1337,9 @@ function table3display(){
 					$("#pcompanyame").data("kendoAutoComplete").options.noDataTemplate = '';
 			}else{
 				$("#autotxt").html('자동완성 On');
-				autocompleteOn();
+				if( !getQueryString("masterCompanyCode") ) {
+					autocompleteOn();
+				}
 			}
 		}
 

src/main/webapp/js/body/psboard/situTable.js

@@ -26,21 +26,16 @@ function showMe(startY,endY,currentPage,currentGroup){
   	mapWin.focus();
 
 }*/
-//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>Ȳ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ŭ<EFBFBD><C5AC><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>˾<EFBFBD> <20><><EFBFBD><EFBFBD>
+
+//시추정보 사업별 현황에서 프로젝트를 지도에 보여준다.
 function openMapLoc(pcode)
 {
   	win = 'map';
-	//sizeX = screen.availwidth-10; // <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	//sizeY = screen.availheight-50; // <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 	sizeX=window.screen.width;
 	sizeY=window.screen.height;
-  	//alert("rowCount = "+rowCount);
-  	//alert("holeCode = "+holeCode);
   	var mapWin = window.open("/map/mapMain.do?pcode=" + pcode,"mapWin","toolbar=no,location=no,directories=no,status=yes,menubar=no,scrollbars=yes,resizable=yes,width=" + sizeX + ",height=" + sizeY + ",left=0,top=0");
   	mapWin.focus();
-  	//openDetail2(pcode);
-
 }
 
 function openDetail2(pcode) {

src/main/webapp/js/home/index.js

@@ -115,53 +115,17 @@ function gourl_html(url){
 	}
 	//
 }
-function gourl_sitemap(url){
 
+function gourl_sitemap(url){
 	window.location.href="/home/" + url;
 }
 
-function gourl(url){
+function gourl(url, src){
-	top.location.href="topMenuSelect.do?url=" + url;
+	var topLocationHref="topMenuSelect.do?url=" + url;
-	/*
+	if( src ) {
-	 * if(url == "intro"){
+		topLocationHref += "&" + "src=" + src;
-	 * top.location.href="https://geoinfo.or.kr/home/intro.jsp"; }else
+	}
-	 * if(url == "info"){
+	top.location.href = topLocationHref;
-	 * top.location.href="https://geoinfo.or.kr/home/info_01.jsp" }else
-	 * if(url == "info3"){
-	 * top.location.href="https://geoinfo.or.kr/home/info_03.jsp"; }else
-	 * if(url == "info4"){
-	 * top.location.href="https://geoinfo.or.kr/home/info_04.jsp"; } else
-	 * if(url == "form"){
-	 * top.location.href="https://geoinfo.or.kr/home/form_01.jsp"; }else
-	 * if(url == "law"){
-	 * top.location.href="https://geoinfo.or.kr/home/law_01.jsp"; }else
-	 * if(url == "center"){
-	 *
-	 *
-	 * top.location.href="https://geoinfo.or.kr/home/center_01.jsp"; }else
-	 * if(url == "center2"){
-	 * top.location.href="https://geoinfo.or.kr/home/center_02.jsp"; }else
-	 * if(url == "center3"){
-	 * top.location.href="https://geoinfo.or.kr/home/center_03.jsp"; }else
-	 * if(url == "cmuboard"){
-	 * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/cmuboard/cmuboard.jsp";
-	 * }else if(url == "notice"){
-	 * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/notice/notice.jsp";
-	 * }else if(url == "situTable"){
-	 * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/jiban_info/situTable.jsp";
-	 * }else if(url == "pds"){
-	 * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/pds/pds.jsp";
-	 * }else if(url == "psboard"){
-	 * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/psboard/psboard.jsp"; }
-	 * else if(url == "faq"){
-	 * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/board/main.jsp";
-	 * }else if(url == "join"){
-	 * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/join/provision.jsp";
-	 * }else if(url == "joinch"){
-	 * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/mypage/main.jsp";
-	 * }else if(url == "joinsearch"){
-	 * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/account/main.jsp"; }
-	 */
 
 }
 /*

src/main/webapp/js/map/main/map.js

@@ -30,6 +30,7 @@ function addLoadEvent(func) {
 	        func();
 	    }
 	}, 100);
+	
 }
 
 function hole_layerOnOff() {
@@ -49,6 +50,32 @@ function hole_layerOnOff() {
 
 }
 
+function forceUncheckHoleLayerOnOff() {
+
+	var returnValue = "";
+	for (i = 1; i <= 33; i++) {
+		$("#browser").find("#hole"+i).prop("checked", false);
+		//returnValue = returnValue + "N";
+	}
+	
+	
+	var body = $('body');
+
+	if (body.hasClass("page-sidebar-closed")) {
+		body.removeClass("page-sidebar-closed");
+
+	} else {
+		body.addClass("page-sidebar-closed");
+	}
+
+	$(window).trigger('resize');
+	BASE_MAP.updateSize();
+	
+
+	changeLegend("NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNY");
+
+}
+
 // ================================================================
 // 변수 : OpenLayers 관리 변수
 // ================================================================
@@ -346,7 +373,7 @@ function initApp(param){
 		}, {
 			singleTile : false,
 			isBaseLayer : false,
-			visibility: getQueryString("masterCompanyCode") === null ? true : false,
+			visibility: getQueryString("masterCompanyCode") === null ? true : true,
 			transitionEffect: "resize",
 			buffer : 0,
 			removeBackBufferDelay : 0
@@ -936,67 +963,16 @@ function initApp(param){
 		}
 
 
-		// select 요소를 가져옵니다.
+
-		if( gl === "국토교통부" ) {
-			//소속 기관
-			selectOptionByText(gs, document.getElementById("cmb_sido_all"));
-			const getGuList2Callback = function () {
-				//onSichAllCheck();
-				const selectedXY = getMiddleXY(document.getElementById("cmb_sido_all").value);
-				//BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedXY.minX, selectedXY.minY, selectedXY.maxX, selectedXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true);			
-			}
-			getGuList2(getGuList2Callback);
-		} else if( gl === "재난관리책임기관" ) {
-			if( gm === "교육청" ) {
-				selectOptionByText(gs, document.getElementById("cmb_sido_all"));
-				const getGuList2Callback = function () {
-					if( gf === null || gf.trim() === "" ) {
-						//onSichAllCheck();
-						const selectedXY = getMiddleXY(document.getElementById("cmb_sido_all").value);
-						//BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedXY.minX, selectedXY.minY, selectedXY.maxX, selectedXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true);
-					} else {
-						selectOptionByText(gf, document.getElementById("cmb_gungu_all"));
-						onSichAllCheck();
-						//const selectedXY = getMiddleXY(document.getElementById("cmb_gungu_all").value);
-						//BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedXY.minX, selectedXY.minY, selectedXY.maxX, selectedXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true);
-					}
-				}
-				getGuList2(getGuList2Callback);
-			}
-		} else {
-			//지방자치단체
-			selectOptionByText(gm, document.getElementById("cmb_sido_all"));
-			const getGuList2Callback = function () {
-				if( gs === null || gs.trim() === "" ) {
-					//onSichAllCheck();
-					const selectedSidoXY = getMiddleXY(document.getElementById("cmb_sido_all").value);
-					//BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedSidoXY.minX, selectedSidoXY.minY, selectedSidoXY.maxX, selectedSidoXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true);
-				} else {
-					selectOptionByText(gs, document.getElementById("cmb_gungu_all"));
-					const getDongList2Callback = function () {
-						if( gf === null || gf.trim() === "" ) {
-							//onSichAllCheck();
-							const selectedGunguXY = getMiddleXY(document.getElementById("cmb_gungu_all").value);
-							var move_bound = new OpenLayers.Bounds(selectedGunguXY.minX, selectedGunguXY.minY, selectedGunguXY.maxX, selectedGunguXY.maxY).transform('EPSG:5186', 'EPSG:3857'); //5174				
-							//BASE_MAP.zoomToExtent(move_bound, true);
-						} else {
-							selectOptionByText(gf, document.getElementById("cmb_dong_all"));
-							//onSichAllCheck();
-							const selectedDongXY = getMiddleXY(document.getElementById("cmb_dong_all").value);
-							//BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedDongXY.minX, selectedDongXY.minY, selectedDongXY.maxX, selectedDongXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true);
-						}				
-					}
-					getDongList2(getDongList2Callback);
-					
-				}
-			}
-			getGuList2(getGuList2Callback);
-		}
-		
 		if( masterCompanyCode ) {
 			addDrillingHoles(masterCompanyCode);
 		}
 		
+
+		if( getQueryString("masterCompanyCode") ) {
+			forceUncheckHoleLayerOnOff();
+		}
+		
 		
 		
 	} else {
@@ -2022,8 +1998,7 @@ function changeProject(pName){
 
 
 function getLegend(){
-
+	if ( HOLE_LAYER.legend == null
-	if (HOLE_LAYER.legend == null
 			|| HOLE_LAYER.legend == "undefined"){
 		return "YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY";
 	}
@@ -2138,7 +2113,6 @@ function addLendLayer(param) {
 }
 
 function changeLegend(checkList) {
-
 	HOLE_LAYER.mergeNewParams({version : '1.3.0'});
 	HOLE_LAYER_M.mergeNewParams({version : '1.3.0'});
 	HOLE_LAYER.legend = checkList;