.

list.txt

@@ -1,11 +1,9 @@
-#src\main\resources\egovframework\egovProps\globals.properties
+src\main\resources\egovframework\egovProps\globals.properties
 #src\main\java\geoinfo\regi\manageList\ManageExcelUploadProc01Controller.java
 #src\main\webapp\WEB-INF\views\web\input\excel_step00.jsp
 #src\main\webapp\WEB-INF\views\web\input\excel_step31.jsp
-src\main\webapp\com\css\common.v2.0.css
-src\main\webapp\com\css\common.v2.0.css.map
-src\main\webapp\WEB-INF\views\home\index.jsp
-src\main\webapp\WEB-INF\views\web\manage\createZip.jsp
-src\main\java\geoinfo\regi\basicInfo\BasicController.java
-src\main\webapp\WEB-INF\views\web\input\basic\labInfoFieldPressuremeter.jsp
-src\main\webapp\js\map\main\left\left.js
+#src\main\webapp\com\css\common.v2.0.css
+#src\main\webapp\com\css\common.v2.0.css.map
+src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp
+
+src\main\webapp\js\map\main\map.js

src/main/java/geoinfo/com/file/service/impl/FileServiceImpl.java

@@ -12,6 +12,7 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
+import egovframework.com.cmm.service.EgovProperties;
 import egovframework.rte.psl.dataaccess.util.EgovMap;
 
 @Service("fileService")
@@ -20,6 +21,9 @@ public class FileServiceImpl implements FileService{
 	@Resource(name="fileMapper")
 	private FileMapper fileMapper;
 
+	String DB_URL 	= EgovProperties.getProperty("Oracle.Url").trim();
+    String DB_USER = EgovProperties.getProperty("Oracle.ID").trim();
+    
 	@Override
 	public Map<String, Object> selectFileInfo(Map<String, Object> map) throws Exception
 	{
@@ -43,6 +47,7 @@ public class FileServiceImpl implements FileService{
 		
 		List<Map<String, Object>> res = null;
 		try {
+			System.out.println("DB URL:[" + DB_URL + "]\n" + "DB USER:[" + DB_USER + "]\n" + "");
 			res = fileMapper.selectFiles(map);
 		} catch (SQLException e) {
 		    if (e.getMessage().contains("Socket read timed out")) {

src/main/java/geoinfo/drilling/common/DrillingCommonController.java

@@ -2,22 +2,33 @@ package geoinfo.drilling.common;
 
 
 import java.util.HashMap;
+import java.util.Map;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import geoinfo.drilling.inquiry.service.DrillingInquiryService;
+import geoinfo.main.login.service.LoginService;
+
 @Controller
 public class DrillingCommonController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(DrillingCommonController.class);
+	
+	@Resource(name = "loginService")
+	private LoginService loginService;
 
+	@Autowired
+    DrillingInquiryService drillingInquiryService;
 	
 	@RequestMapping(value = "/drilling/common/includeTopMenu.do")
 	public String memberRegi(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -30,6 +41,18 @@ public class DrillingCommonController {
 		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")));
+
+		Map<String, Object> result = loginService.selectWebMemberIn(map);
+		
+		model.put("masterCompanyCode", result.get("master_company_code"));
+		
+
+    	HashMap<String, Object> spGetProjectMbrParams = drillingInquiryService.spGetProjectMbr( request, params, String.valueOf(request.getSession().getAttribute("USERID")) );
+    	model.addAttribute("mbr", spGetProjectMbrParams);
+		
 		return "/drilling/common/includeTopMenu";
 	}
 }

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,16 +40,19 @@ 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;
 import geoinfo.drilling.home.service.DrillingHomeService;
 import geoinfo.drilling.input.service.DrillingInputService;
 import geoinfo.drilling.inquiry.service.DrillingInquiryService;
+import geoinfo.main.login.service.LoginService;
 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;
@@ -60,6 +64,9 @@ public class DrillingHomeController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DrillingHomeController.class);
 
+    @Resource(name = "loginService")
+	private LoginService loginService;
+    
     @Autowired
     DrillingHomeService drillingHomeService;
     
@@ -81,8 +88,22 @@ public class DrillingHomeController {
         model.addAttribute("cls", cls);
         
         try {
-        	HashMap<String, Object> spGetProjectMbrParams = drillingInquiryService.spGetProjectMbr( request, params, userId );
-        	model.addAttribute("mbr", spGetProjectMbrParams);
+        	
+        	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")));
+
+    		Map<String, Object> result = loginService.selectWebMemberIn(map);
+    		
+    		model.put("masterCompanyCode", result.get("master_company_code"));
         } catch (Exception e) {
             // TODO Auto-generated catch block
             String strTxt =
@@ -98,4 +119,116 @@ public class DrillingHomeController {
 
         return "/drilling/home/drilling_index";
     }
+    
+    //	지도에서 발주기관 소속 시추공 표시
+	@RequestMapping(value = "/drilling/map/search-hole.do", method = RequestMethod.GET)
+	public String drillingMapSearchHole(HttpServletRequest request, String projectCode, ModelMap model) throws Exception {
+		model.put("data", drillingHomeService.drillingMapSearchHole(projectCode));
+		
+		HashMap<String, Object> params = new HashMap<String, Object>(); 
+		HashMap<String, Object> spGetProjectMbrParams = drillingInquiryService.spGetProjectMbr( request, params, String.valueOf(request.getSession().getAttribute("USERID")) );
+    	model.addAttribute("mbr", spGetProjectMbrParams);
+    	
+		return "jsonView";
+	}
+	
+	//	MBR을 이용해 지도에서 발주기관 소속 시추공 표시 
+	@RequestMapping(value = "/drilling/map/search-hole-with-mbr.do", method = RequestMethod.GET)
+	public String drillingMapSearchHoleWithMbr(HttpServletRequest request, String companyCode, ModelMap model) throws Exception {
+		
+		
+		HashMap<String, Object> params = new HashMap<String, Object>();
+		params.put("COM_CODE", companyCode);
+		
+		EgovMap mbr = drillingInquiryService.getTblMasterCompanyMbrByComCode(request, params, String.valueOf(request.getSession().getAttribute("USERID")));
+    	model.addAttribute("mbr", mbr);
+    	    	
+    	double nOffsetKm = 2.0f; // 2Km 밖 까지 허용한다.
+    	params.put("MIN_X", MyUtil.getDoubleFromObject( mbr.get("minX") ) - nOffsetKm*1000);
+    	params.put("MIN_Y", MyUtil.getDoubleFromObject( mbr.get("minY") ) - nOffsetKm*1000);
+    	params.put("MAX_X", MyUtil.getDoubleFromObject( mbr.get("maxX") ) + nOffsetKm*1000);
+    	params.put("MAX_Y", MyUtil.getDoubleFromObject( mbr.get("maxY") ) + nOffsetKm*1000);
+    	
+		model.put("data", drillingHomeService.drillingMapSearchHoleWithMbr(params));
+
+		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/home/service/DrillingHomeMapper.java

@@ -9,7 +9,8 @@ import egovframework.rte.psl.dataaccess.util.EgovMap;
 
 @Mapper("drillingHomeMapper")
 public interface DrillingHomeMapper  {	
-	
+	List<EgovMap> drillingMapSearchHole(String comCode);
+	List<EgovMap> drillingMapSearchHoleWithMbr(HashMap<String, Object> params);
 }
 
 

src/main/java/geoinfo/drilling/home/service/DrillingHomeService.java

@@ -1,13 +1,12 @@
 package geoinfo.drilling.home.service;
 
 import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.json.simple.JSONObject;
+import egovframework.rte.psl.dataaccess.util.EgovMap;
 
 
 public interface DrillingHomeService {
-	
+	public List<EgovMap> drillingMapSearchHole(String projectCode);
+	public List<EgovMap> drillingMapSearchHoleWithMbr(HashMap<String, Object> params);
 }

src/main/java/geoinfo/drilling/home/service/impl/DrillingHomeServiceImpl.java

@@ -32,6 +32,16 @@ public class DrillingHomeServiceImpl implements DrillingHomeService {
 
     @Resource(name="drillingHomeMapper")
     private DrillingHomeMapper drillingHomeMapper;
+    
+	@Override
+	public List<EgovMap> drillingMapSearchHole(String projectCode) {
+		return drillingHomeMapper.drillingMapSearchHole(projectCode);
+	}
+	
+	@Override
+	public List<EgovMap> drillingMapSearchHoleWithMbr(HashMap<String, Object> params) {
+		return drillingHomeMapper.drillingMapSearchHoleWithMbr(params);
+	}
       
 
 }

src/main/java/geoinfo/drilling/input/service/DrillingInputMapper.java

@@ -2,6 +2,7 @@ package geoinfo.drilling.input.service;
 
 import java.sql.SQLException;
 import java.util.HashMap;
+import java.util.List;
 
 import egovframework.rte.psl.dataaccess.mapper.Mapper;
 import egovframework.rte.psl.dataaccess.util.EgovMap;
@@ -15,7 +16,13 @@ public interface DrillingInputMapper  {
 	public void spGetMasterCompanyDistrict(HashMap<String, Object> spGetMasterCompanyDistrictParams) throws SQLException;
 	
 	public EgovMap getDepartments(HashMap<String, Object> params) throws SQLException;
+	public HashMap<String, Object> spUdtTblCsi(HashMap<String, Object> params) throws SQLException;
 	
+	public List<EgovMap> sPGetTblCsiByCid(HashMap<String, Object> params) throws SQLException;
+	public EgovMap getItemByCid(HashMap<String, Object> params) throws SQLException;
+	
+	public int updateProjectCodeAndProjectStateCodeByCid(HashMap<String, Object> params) throws SQLException;
+	public int updateProjectCodeAndProjectStateCodeByProjectCode(HashMap<String, Object> params) throws SQLException;
 }
 
 

src/main/java/geoinfo/drilling/input/service/DrillingInputService.java

@@ -11,4 +11,7 @@ public interface DrillingInputService {
 	HashMap<String, Object> getOrganizationUserGlGmGsGfCodes(String userId) throws Exception;
 	HashMap<String, Object> drillingInputAdd(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
 	void getDepartments(HttpServletRequest request, HashMap<String, Object> params, JSONObject jsonResponse) throws Exception;
+	HashMap<String, Object> updateProjectCodeAndProjectStateCodeByCid(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
+	HashMap<String, Object> updateProjectCodeAndProjectStateCodeByProjectCode(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
+	
 }

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

@@ -119,5 +119,78 @@ public class DrillingInputServiceImpl implements DrillingInputService {
         }
 		
 	}
+	
+	
+	@Override
+	public HashMap<String, Object> updateProjectCodeAndProjectStateCodeByCid(HttpServletRequest request, HashMap<String, Object> params) throws Exception {
+			
+		String userId = (String)request.getSession().getAttribute("USERID");
 
+		params.put("userId", userId);
+        
+		try {
+			/*
+			List<EgovMap> sPGetTblCsiByCidParams = drillingInputMapper.sPGetTblCsiByCid( params );
+			
+			if( sPGetTblCsiByCidParams.size() == 0 ) {
+				return params;
+			}
+			EgovMap tbl = sPGetTblCsiByCidParams.get(0);
+			*/
+			
+			EgovMap tbl = drillingInputMapper.getItemByCid( params );
+			if( tbl != null ) {				
+				HashMap<String, Object> updateProjectCodeParams = new HashMap<String, Object>();
+				
+				updateProjectCodeParams.put("userId", userId);
+				updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE"));
+				updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE"));   
+				updateProjectCodeParams.put("CID", params.get("CID"));
+				
+				int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByCid(updateProjectCodeParams);
+				if( nResult == 0 ) {
+					if( tbl.get("projectCode") != null && !tbl.get("projectCode").equals(params.get("PROJECT_CODE")) ) {
+						throw new Exception( "해당 프로젝트는 이미 다른 프로젝트와 연결되어 있습니다." );
+					}
+				}
+				
+			}
+			return params;
+		} catch (SQLException e) {
+            throw new Exception( e.getMessage() );
+        }
+		
+	}
+
+	@Override
+	public HashMap<String, Object> updateProjectCodeAndProjectStateCodeByProjectCode(HttpServletRequest request, HashMap<String, Object> params) throws Exception {
+			
+		String userId = (String)request.getSession().getAttribute("USERID");
+
+		params.put("userId", userId);
+        
+		try {
+			
+			EgovMap tbl = drillingInputMapper.getItemByCid( params );
+			if( tbl != null ) {
+				
+				HashMap<String, Object> updateProjectCodeParams = new HashMap<String, Object>();
+				
+				updateProjectCodeParams.put("userId", userId);
+				updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE"));
+				updateProjectCodeParams.put("WHERE_PROJECT_CODE", params.get("WHERE_PROJECT_CODE"));
+				updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE"));   
+				updateProjectCodeParams.put("CID", params.get("CID"));
+							
+				
+				int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByProjectCode(updateProjectCodeParams);
+				if( nResult == 0 ) {
+				}				
+			}
+			return params;
+		} catch (SQLException e) {
+            throw new Exception( e.getMessage() );
+        }
+		
+	}
 }

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" +
@@ -125,52 +125,54 @@ public class DrillingInquiryController {
             "\n--------------------------------------------------------------\n"
         );
 
-            JSONObject jSONOResponse = null;
-            try {
-                jSONOResponse = drillingInquiryService.drillingInquiryList( request, params );
-            } catch (Exception e) {
-                // TODO Auto-generated catch block
-                jSONOResponse = new JSONObject();
-                String strTxt =
-                        "---------- BUG REPORTING START ----------" + "\n" +
-                        "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" +
-                        "params:[\n" + params.toString() + "\n]\n" +
-                        "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" +
-                        "new Date().toString():[" + new Date().toString() + "]\n" + "\n" +
-                        "---------- BUG REPORTING END ----------" + "\n" +
-                        "";
-                System.out.println(strTxt);
-                jSONOResponse.put("resultCode", -1);
-                jSONOResponse.put("result", "false");
-                jSONOResponse.put("message",  e.getMessage());
-            }
-
-
-            System.out.println("\n--------------------------------------------------------------\n" +
-                    request.getRequestURI() + " OUT:" +
-                    "\n--------------------------------------------------------------\n" +
-                    "jSONOResponse.toJSONString():[" + jSONOResponse.toJSONString() + "]\n" +
-                    "\n--------------------------------------------------------------\n");
-
-
-            int contentLength = 0;
-            try {
-                contentLength = jSONOResponse.toJSONString().getBytes("UTF-8").length;
-            } catch (UnsupportedEncodingException e1) {
-                // TODO Auto-generated catch block
-                e1.printStackTrace();
-            }
-            response.setStatus(HttpServletResponse.SC_OK);
-            response.setCharacterEncoding("UTF-8");
-            response.setHeader("Content-Type", "application/json; charset=utf-8");
-            response.setContentLength(contentLength); // Content-Length 설정
-            try {
-                response.getWriter().print(jSONOResponse);
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-
-            return null;
+        JSONObject jSONOResponse = null;
+        try {
+            jSONOResponse = drillingInquiryService.drillingInquiryList( request, params );
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            jSONOResponse = new JSONObject();
+            String strTxt =
+                    "---------- BUG REPORTING START ----------" + "\n" +
+                    "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" +
+                    "params:[\n" + params.toString() + "\n]\n" +
+                    "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" +
+                    "new Date().toString():[" + new Date().toString() + "]\n" + "\n" +
+                    "---------- BUG REPORTING END ----------" + "\n" +
+                    "";
+            System.out.println(strTxt);
+            jSONOResponse.put("resultCode", -1);
+            jSONOResponse.put("result", "false");
+            jSONOResponse.put("message",  e.getMessage());
         }
+
+
+        System.out.println(
+    		"\n--------------------------------------------------------------\n" +
+            request.getRequestURI() + " OUT:" +
+            "\n--------------------------------------------------------------\n" +
+            "jSONOResponse.toJSONString():[" + jSONOResponse.toJSONString() + "]\n" +
+            "\n--------------------------------------------------------------\n"
+         );
+
+
+        int contentLength = 0;
+        try {
+            contentLength = jSONOResponse.toJSONString().getBytes("UTF-8").length;
+        } catch (UnsupportedEncodingException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        }
+        response.setStatus(HttpServletResponse.SC_OK);
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("Content-Type", "application/json; charset=utf-8");
+        response.setContentLength(contentLength); // Content-Length 설정
+        try {
+            response.getWriter().print(jSONOResponse);
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        return null;
+    }
 }

src/main/java/geoinfo/drilling/inquiry/service/DrillingInquiryMapper.java

@@ -14,6 +14,9 @@ public interface DrillingInquiryMapper  {
 	public List<EgovMap> spGetTblCsiByKeyword(HashMap<String, Object> params) throws SQLException;
 	public String spGetConstCompanyName(Long constCompanyCode) throws SQLException;
 	public String spGetProjectMbr(HashMap<String, Object> params) throws SQLException;
+	public List<EgovMap> drillingInquiryAutocompleteList(HashMap<String, Object> params) throws SQLException;
+	public EgovMap getItemByProjectCode(HashMap<String, Object> params) throws SQLException;
+	public EgovMap getTblMasterCompanyMbrByComCode(HashMap<String, Object> params) throws SQLException;
 	
 }
 

src/main/java/geoinfo/drilling/inquiry/service/DrillingInquiryService.java

@@ -1,15 +1,22 @@
 package geoinfo.drilling.inquiry.service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.json.simple.JSONObject;
 
+import egovframework.rte.psl.dataaccess.util.EgovMap;
+
 
 public interface DrillingInquiryService {
 	JSONObject drillingInquiryList(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
 	HashMap<String, Object> spGetProjectMbr(HttpServletRequest request, HashMap<String, Object> params, String userId) throws Exception;
+	List<EgovMap> drillingInquiryAutocompleteList(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
+	EgovMap getItemByProjectCode(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
+
+	EgovMap getTblMasterCompanyMbrByComCode(HttpServletRequest request, HashMap<String, Object> params, String userId) throws Exception;
 	
 }

src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java

@@ -50,35 +50,6 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService {
             throw new Exception( "로그인이 필요한 서비스입니다." );
         }
         
-
-		
-        if( false ) {
-
-            //로그인된 계정으로 아래 코드를 구해야 함. 20240820 1915 2025-01-15 구현이 완료 됨.
-            
-            String referrer = request. getHeader("referer");
-            
-            String masterCompanyOCode = "01";
-            if( referrer.indexOf("/drilling/inquiry-project.do") == -1 ) {
-            	masterCompanyOCode = null;
-            }
-            params.put("masterCompanyOCode", masterCompanyOCode);
-            
-            String masterCompanyTwCode  = "01";
-            if( referrer.indexOf("/drilling/inquiry-project.do") == -1 ) {
-            	masterCompanyTwCode = null;
-            }
-            params.put("masterCompanyTwCode", masterCompanyTwCode);
-            
-            String masterCompanyThCode = "002";
-            if( referrer.indexOf("/drilling/inquiry-project.do") == -1 ) {
-            	masterCompanyThCode = null;
-            }
-            params.put("masterCompanyThCode", masterCompanyThCode);
-
-            String masterCompanyName  = null; 
-            params.put("masterCompanyName", masterCompanyName);
-        }
         
         HashMap<String, Object> spGetMasterCompanyDistrictParams = drillingInputService.getOrganizationUserGlGmGsGfCodes(userId);
         
@@ -139,7 +110,7 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService {
                 	}
                 	data.put("constStateCodeName", constStateCodeName);
                 	
-                	
+                	 
                 	
                 	Long nConstCompanyCodeKey = MyUtil.getLongFromObject(data.get(constCompanyCodeKey));
                 	if( nConstCompanyCodeKey != null ) {
@@ -173,6 +144,9 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService {
                 		case 5:
                 			projectStateCodeName = "검수 완료";
                 			break;
+                		case 6:
+                			projectStateCodeName = "등록 완료";
+                			break;
                 		default:
                 			constStateCodeName = "알 수 없음";
                 			break;
@@ -292,6 +266,98 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService {
 		
 		return spGetProjectMbrParams;
 	}
+	
+	
+	@Override
+    public List<EgovMap> drillingInquiryAutocompleteList(HttpServletRequest request, HashMap<String, Object> params) throws Exception {
+
+        String userId 				= MyUtil.getStringFromObject( request.getSession().getAttribute("USERID") );
+        
+        if( userId == null){
+            throw new Exception( "로그인이 필요한 서비스입니다." );
+        }
+        
+        
+        try {        	
+            try {
+            	List<EgovMap> list         = drillingInquiryMapper.drillingInquiryAutocompleteList(params);
+                return list;
+            } catch (SQLException e) {
+                String strTxt =
+	                "---------- BUG REPORTING START ----------" + "\n" +
+	                "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" +
+	                "params:[\n" + params.toString() + "\n]\n" +
+	                "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" +
+	                "new Date().toString():[" + new Date().toString() + "]\n" + "\n" +
+	                "---------- BUG REPORTING END ----------" + "\n" +
+	                "";
+                System.out.println(strTxt);
+                throw new Exception( "오류가 발생하였습니다." + "\n" + "SQLException" );
+            }
+
+
+        } catch (org.json.simple.parser.ParseException e) {
+            // TODO Auto-generated catch block
+            throw new Exception( e.getMessage() );
+        }
+    }
+	
+	@Override
+	public EgovMap getItemByProjectCode(HttpServletRequest request, HashMap<String, Object> params) throws Exception {
+
+        String userId 				= MyUtil.getStringFromObject( request.getSession().getAttribute("USERID") );
+        
+        if( userId == null){
+            throw new Exception( "로그인이 필요한 서비스입니다." );
+        }
+        
+        try {
+        	EgovMap item         = drillingInquiryMapper.getItemByProjectCode(params);
+        	return item;
+        } catch (SQLException e) {
+            String strTxt =
+                "---------- BUG REPORTING START ----------" + "\n" +
+                "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" +
+                "params:[\n" + params.toString() + "\n]\n" +
+                "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" +
+                "new Date().toString():[" + new Date().toString() + "]\n" + "\n" +
+                "---------- BUG REPORTING END ----------" + "\n" +
+                "";
+            System.out.println(strTxt);
+            throw new Exception( "오류가 발생하였습니다." + "\n" + "SQLException" );
+        }		
+	}
+
+
+	@Override
+	public EgovMap getTblMasterCompanyMbrByComCode(HttpServletRequest request,
+			HashMap<String, Object> params, String userId) throws Exception {
+		
+		// TODO Auto-generated method stub
+		if( userId == null || userId.trim().isEmpty() ) {
+			throw new Exception( "로그인이 필요한 서비스입니다." );
+		}
+		
+		
+		HashMap<String, Object> getTblMasterCompanyMbrByComCodeParams = new HashMap<String, Object>();		
+		getTblMasterCompanyMbrByComCodeParams.put("COM_CODE", params.get("COM_CODE"));
+		
+		try {
+        	EgovMap item         = drillingInquiryMapper.getTblMasterCompanyMbrByComCode( getTblMasterCompanyMbrByComCodeParams );
+        	return item;
+        } catch (SQLException e) {
+            String strTxt =
+                "---------- BUG REPORTING START ----------" + "\n" +
+                "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" +
+                "params:[\n" + params.toString() + "\n]\n" +
+                "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" +
+                "new Date().toString():[" + new Date().toString() + "]\n" + "\n" +
+                "---------- BUG REPORTING END ----------" + "\n" +
+                "";
+            System.out.println(strTxt);
+            throw new Exception( "오류가 발생하였습니다." + "\n" + "SQLException" );
+        }
+	}
     
 
 }

src/main/java/geoinfo/main/login/LoginController.java

@@ -1076,6 +1076,11 @@ public class LoginController {
 										url = "home/main_sitemap.jsp";
 									else
 										url = "index.do?cntyn=0";
+								} else if (cls.equals("2")) { // 발주기관일경우
+									if (location.equals("left"))
+										url = "left.do";
+									else
+										url = "drilling/index.do";
 								} else if (cls.equals("9")) { // 관리자일경우
 									if (location.equals("left"))
 										url = "left.do";
@@ -1613,6 +1618,12 @@ public class LoginController {
 		map.clear();
 		map.put("table", "WEB_MEMBER_IN");
 		map.put("values", "PSWD_MONTH=SYSDATE, PASSWD='" + passwordch + "'");
+		if( DI != null && !DI.isEmpty() ) {
+			//DI값을 업데이트 한다.
+			String values = MyUtil.getStringFromObject( map.get("values") );	
+			values += ", DUPINFO='" + DI + "'";
+			map.put("values", values);
+		}
 		map.put("where", "TRIM(USERID)='" + SessionuserId + "'");
 		affectedRows = loginService.userUpdate(map);
 
@@ -1654,7 +1665,7 @@ public class LoginController {
 		// 이미 등록되어 있는경우 날짜만 업데이트한다.
 		if (egovMap != null) {
 			int sCount = 0;
-			String sCode = GeoinfoCommon.parseData(String.valueOf(egovMap.get("selectCode")));
+			String sCode = GeoinfoCommon.parseData(MyUtil.ClobToString((java.sql.Clob) egovMap.get("selectCode")));
 			sCode = sCode.replaceAll("null,", "");
 			sCode = sCode.replaceAll(",null", "");
 			String[] sCodeArray = new String[sCount];

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/map/main/MapMainController.java

@@ -3,6 +3,7 @@ package geoinfo.map.main;
 import egovframework.rte.psl.dataaccess.util.EgovMap;
 import geoinfo.com.GeoinfoCommon;
 import geoinfo.map.main.service.MapMainService;
+import geoinfo.util.MyUtil;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -52,8 +53,8 @@ public class MapMainController {
 
 		EgovMap selectCode = mapMainService.selectWebSelectCode(params);
 
-		if(selectCode != null) {
-			String code[] = (String.valueOf(selectCode.get("selectCode"))).split(",");
+		if(selectCode != null) { 
+			String code[] = MyUtil.ClobToString((java.sql.Clob)selectCode.get("selectCode")).split(",");
 			int codeCount = 0;
 			for(int i =0; i < code.length; i++ ) {
 				if(code[i] != null && !code[i].equals("") && !code[i].equals(" ") && !code[i].equals("null") ) {

src/main/java/geoinfo/map/mapControl/MapContorlController.java

@@ -36,6 +36,7 @@ import egovframework.rte.psl.dataaccess.util.EgovMap;
 import geoinfo.com.GeoinfoCommon;
 import geoinfo.map.mapControl.service.MapControlService;
 import geoinfo.regi.selectClassInfo.service.SelectClassService;
+import geoinfo.util.MyUtil;
 import net.sf.json.JSONArray;
 
 @Controller
@@ -363,7 +364,7 @@ public class MapContorlController {
 		// 이미 등록되어 있는경우 날짜만 업데이트한다.
 		if (egovMap != null) {
 			int sCount = 0;
-			String sCode = GeoinfoCommon.parseData(String.valueOf(egovMap.get("selectCode")));
+			String sCode = GeoinfoCommon.parseData(MyUtil.ClobToString((java.sql.Clob) egovMap.get("selectCode")));
 			sCode = sCode.replaceAll("null,", "");
 			sCode = sCode.replaceAll(",null", "");
 			String[] sCodeArray = new String[sCount];
@@ -455,7 +456,7 @@ public class MapContorlController {
 		EgovMap idx = mapControlService.selectWebCartIndex(params);
 		// 이미 등록되어 있는경우 날짜만 업데이트한다.
 		if (idx != null) {
-			String sCode = GeoinfoCommon.parseData(String.valueOf(idx.get("selectCode")));
+			String sCode = GeoinfoCommon.parseData(MyUtil.ClobToString((java.sql.Clob)idx.get("selectCode")));
 			sCode = sCode + "," +params.get("selectCode");
 			params.put("selectCode", sCode);
 			mapControlService.updateWebCartDate(params);
@@ -550,7 +551,7 @@ public class MapContorlController {
 		params.put("metadataId", mId);
 		params.put("holeCode", hcode);
 
-		String selectCode = (String)(mapControlService.selectWebCartUserId(params)).get("selectCode");
+		String selectCode = MyUtil.ClobToString((java.sql.Clob)mapControlService.selectWebCartUserId(params).get("selectCode"));
 		String selectCodeArray[] = selectCode.split(",");
 		String selectCodeWebCart = "";
 
@@ -802,7 +803,12 @@ public class MapContorlController {
 
 		EgovMap webCart = mapControlService.selectWebCartUserId(params);
 		System.out.println(webCart != null);
-		String selectCode[] = (webCart != null)? ((String)webCart.get("selectCode")).split(","):null;
+		
+		//CLOB TO STRING
+		String clobData = MyUtil.ClobToString((java.sql.Clob) webCart.get("selectCode"));
+		System.out.println(clobData);
+		
+		String selectCode[] = (webCart != null)? clobData.split(","):null;
 		List<EgovMap> projectHodeCode = mapControlService.selectHodeCode(params);
 			if(projectHodeCode != null ) {
 				String hodeCode[] = new String[projectHodeCode.size()];
@@ -848,7 +854,7 @@ public class MapContorlController {
 		EgovMap selectCode = mapControlService.selectWebCartUserId(params);
 
 		if(selectCode != null) {
-			String code[] = (String.valueOf(selectCode.get("selectCode"))).split(",");
+			String code[] = MyUtil.ClobToString((java.sql.Clob)selectCode.get("selectCode")).split(",");
 			int codeCount = 0;
 			for(int i =0; i < code.length; i++ ) {
 				if(code[i] != null && !code[i].equals("") && !code[i].equals(" ") && !code[i].equals("null") ) {

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

@@ -4,6 +4,7 @@ import egovframework.com.cmm.service.EgovProperties;
 import egovframework.rte.psl.dataaccess.util.EgovMap;
 import geoinfo.com.GeoinfoCommon;
 import geoinfo.com.file.FileCmmn;
+import geoinfo.drilling.inquiry.service.DrillingInquiryService;
 import geoinfo.regi.info.service.InfoService;
 import ictway.comm.web.GlobalsWeb;
 import ictway.comm.web.WebUtil;
@@ -52,6 +53,9 @@ public class InfoController {
 
 	@Resource(name = "infoService")
 	private InfoService infoService;
+	
+	@Resource(name = "drillingInquiryService")
+    DrillingInquiryService drillingInquiryService;
 
 /*  20231223 트랜젝션 중복문제로 제거
  * 	@Autowired
@@ -87,6 +91,36 @@ public class InfoController {
 
 		List<EgovMap> dis = infoService.getDisList(params);
 		jsonObj.put("dis", dis);
+		
+		//발주기관에서 등록한 프로젝트와 맵핑되는 프로젝트를 검색한다.
+		EgovMap tempConstructSiteInfo = drillingInquiryService.getItemByProjectCode(request, params);
+		if( tempConstructSiteInfo != null && tempConstructSiteInfo.get("projectCode") != null ) {
+
+			JSONObject jsonTempConstructSiteInfo = new JSONObject();
+			
+			jsonTempConstructSiteInfo.put("cid",                   tempConstructSiteInfo.get("cid"));
+			jsonTempConstructSiteInfo.put("constName",             tempConstructSiteInfo.get("constName"));
+			jsonTempConstructSiteInfo.put("constStartDate",        tempConstructSiteInfo.get("constStartDate"));
+			jsonTempConstructSiteInfo.put("constEndDate",          tempConstructSiteInfo.get("constEndDate"));
+			jsonTempConstructSiteInfo.put("constStateCode",        tempConstructSiteInfo.get("constStateCode"));
+			jsonTempConstructSiteInfo.put("masterCompanyOCode",    tempConstructSiteInfo.get("masterCompanyOCode"));
+			jsonTempConstructSiteInfo.put("masterCompanyTwCode",   tempConstructSiteInfo.get("masterCompanyTwCode"));
+			jsonTempConstructSiteInfo.put("masterCompanyThCode",   tempConstructSiteInfo.get("masterCompanyThCode"));
+			jsonTempConstructSiteInfo.put("masterCompanyName",     tempConstructSiteInfo.get("masterCompanyName"));
+			jsonTempConstructSiteInfo.put("masterCompanyDept",     tempConstructSiteInfo.get("masterCompanyDept"));
+			jsonTempConstructSiteInfo.put("masterCompanyAdmin",    tempConstructSiteInfo.get("masterCompanyAdmin"));
+			jsonTempConstructSiteInfo.put("masterCompanyTel",      tempConstructSiteInfo.get("masterCompanyTel"));
+			jsonTempConstructSiteInfo.put("constCompanyCode",      tempConstructSiteInfo.get("constCompanyCode"));
+			jsonTempConstructSiteInfo.put("constCompanyAdmin",     tempConstructSiteInfo.get("constCompanyAdmin"));
+			jsonTempConstructSiteInfo.put("constCompanyTel",       tempConstructSiteInfo.get("constCompanyTel"));
+			jsonTempConstructSiteInfo.put("projectStateCode",      tempConstructSiteInfo.get("projectStateCode"));
+			jsonTempConstructSiteInfo.put("projectHoleNumber",     tempConstructSiteInfo.get("projectHoleNumber"));
+			jsonTempConstructSiteInfo.put("constTag",              tempConstructSiteInfo.get("constTag"));
+			jsonTempConstructSiteInfo.put("projectCode",           tempConstructSiteInfo.get("projectCode"));
+
+			jsonObj.put("tempConstructSiteInfo", jsonTempConstructSiteInfo);
+		}
+		
 
 		// 수정모드
 		if ("".equals(oProjectCode) == false) {

src/main/java/geoinfo/regi/manageList/ManageListController.java

@@ -115,58 +115,57 @@ public class ManageListController {
 		String oPROJECT_CODE = sUtil.checkNull(parseData.parseData((String)params.get("PROJECT_CODE"))); // 프로젝트코드
 		String inputMode = ""; // 수정모드
 		if(!(null == oPROJECT_CODE || "" == oPROJECT_CODE)){
-		int count = 0;
-
-		HashMap mapDis = new HashMap();
-		HashMap mapMetaInfo = new HashMap();
-		ArrayList arrayDis = new ArrayList();
-		List<?> arrayMetaInfo = new ArrayList();
-
-		String strQuery = "";
-		String inputdata = wUtil.getToday();
-
-		strQuery = wUtil.getDisQuery();
-
-		// Array 로 받기
-		arrayDis = commonService.getDis();
-		// arrayDis = wUtil.getDataArrayList(resultSet, rsmd, count);
-
-		// SelectBox형태로 map으로 받기
-		mapDis = wUtil.getCommCodeSel("L_DIS,M_DIS", arrayDis, "");
-
-		// 수정모드
-
-		arrayMetaInfo = commonService.getMetaInfo(params);
-
-		// Array 로 받기
-
-		// MAP
-		if (arrayMetaInfo.isEmpty() == false) {
-			mapMetaInfo = (HashMap) arrayMetaInfo.get(0);
-			// 입력날짜
-			inputdata = wUtil.isNullOb(mapMetaInfo.get("INPUTDATE"),wUtil.getToday());
-		}
-
-		//프로젝트 정보
-		params.put("projectCode",oPROJECT_CODE);
-		EgovMap projectInfo = infoService.getProjectInfo(params);
-		model.addAttribute("project", projectInfo);
-
-		model.addAttribute("arrayDis", arrayDis);
-		model.addAttribute("mapDis", mapDis);
-		model.addAttribute("arrayMetaInfo", arrayMetaInfo);
-		model.addAttribute("inputdata", inputdata);
-		model.addAttribute("holeSpotSd",wUtil.isNullOb(mapMetaInfo.get("HOLE_SPOT_SD")));
-		model.addAttribute("mapMetaInfo", mapMetaInfo);
-		model.addAttribute("reportType", oREPORT_TYPE);
-		model.addAttribute("projectCode", oPROJECT_CODE);
-		model.addAttribute("HOLE_SPOT_SD",wUtil.isNullOb((mapMetaInfo.get("HOLE_SPOT_SD"))));
-		model.addAttribute("HOLE_SPOT_SGG",wUtil.isNullOb(mapMetaInfo.get("HOLE_SPOT_SGG")));
-		model.addAttribute("L_DIS", mapDis.get("L_DIS"));
-
-		return "/web/input/meta_info";
-		}
-		else{
+			int count = 0;
+	
+			HashMap mapDis = new HashMap();
+			HashMap mapMetaInfo = new HashMap();
+			ArrayList arrayDis = new ArrayList();
+			List<?> arrayMetaInfo = new ArrayList();
+	
+			String strQuery = "";
+			String inputdata = wUtil.getToday();
+	
+			strQuery = wUtil.getDisQuery();
+	
+			// Array 로 받기
+			arrayDis = commonService.getDis();
+			// arrayDis = wUtil.getDataArrayList(resultSet, rsmd, count);
+	
+			// SelectBox형태로 map으로 받기
+			mapDis = wUtil.getCommCodeSel("L_DIS,M_DIS", arrayDis, "");
+	
+			// 수정모드
+	
+			arrayMetaInfo = commonService.getMetaInfo(params);
+	
+			// Array 로 받기
+	
+			// MAP
+			if (arrayMetaInfo.isEmpty() == false) {
+				mapMetaInfo = (HashMap) arrayMetaInfo.get(0);
+				// 입력날짜
+				inputdata = wUtil.isNullOb(mapMetaInfo.get("INPUTDATE"),wUtil.getToday());
+			}
+	
+			//프로젝트 정보
+			params.put("projectCode",oPROJECT_CODE);
+			EgovMap projectInfo = infoService.getProjectInfo(params);
+			model.addAttribute("project", projectInfo);
+	
+			model.addAttribute("arrayDis", arrayDis);
+			model.addAttribute("mapDis", mapDis);
+			model.addAttribute("arrayMetaInfo", arrayMetaInfo);
+			model.addAttribute("inputdata", inputdata);
+			model.addAttribute("holeSpotSd",wUtil.isNullOb(mapMetaInfo.get("HOLE_SPOT_SD")));
+			model.addAttribute("mapMetaInfo", mapMetaInfo);
+			model.addAttribute("reportType", oREPORT_TYPE);
+			model.addAttribute("projectCode", oPROJECT_CODE);
+			model.addAttribute("HOLE_SPOT_SD",wUtil.isNullOb((mapMetaInfo.get("HOLE_SPOT_SD"))));
+			model.addAttribute("HOLE_SPOT_SGG",wUtil.isNullOb(mapMetaInfo.get("HOLE_SPOT_SGG")));
+			model.addAttribute("L_DIS", mapDis.get("L_DIS"));
+	
+			return "/web/input/meta_info";
+		} else {
 			// 지반정보등록 (신규)
 			int count = 0;
 

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

@@ -9,7 +9,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -21,6 +23,8 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.util.UrlPathHelper;
 
 import egovframework.rte.psl.dataaccess.util.EgovMap;
+import geoinfo.drilling.input.service.DrillingInputService;
+import geoinfo.drilling.inquiry.service.DrillingInquiryService;
 import geoinfo.regi.header.service.HeaderService;
 import geoinfo.regi.projectList.service.ProjectListService;
 import geoinfo.regi.status.service.RegiPageService;
@@ -39,6 +43,13 @@ public class ProjectListController {
 	@Resource(name = "headerService")
 	private HeaderService headerService;
 
+	@Resource(name = "drillingInquiryService")
+	private DrillingInquiryService drillingInquiryService;
+	
+	@Autowired
+	private DrillingInputService drillingInputService;
+	
+
 	//프로젝트명 중복여부를 체크한다.
 	@ResponseBody
 	@RequestMapping(value = "/project-duplicate-check", method = RequestMethod.GET, produces = "application/json; charset=UTF-8")
@@ -81,7 +92,7 @@ public class ProjectListController {
 					jsonObject.put("resultCode", "The name already exists.");
 					jsonObject.put("message", "해당 사업명이 이미 있습니다. 다른 사업명으로 입력해 주세요. code 2");
 				}
-			} else if( 0 < arrConstNameByProjectNameFromTempConstructSiteInfo.size() ) {
+			} else if( false && 0 < arrConstNameByProjectNameFromTempConstructSiteInfo.size() ) { 
 				jsonObject.put("result", "false");
 				jsonObject.put("resultCode", "The name already exists.");
 				jsonObject.put("message", "해당 사업명이 이미 있습니다. 다른 사업명으로 입력해 주세요. code 3");
@@ -115,27 +126,28 @@ public class ProjectListController {
 		WebUtil wUtil = new WebUtil();
 		strUtil sUtil = new strUtil();
 		int affectRow = 0;
-		String rUrl = sUtil.checkNull(String.valueOf(params.get("rUrl")));
+		String rUrl 							= sUtil.checkNull(String.valueOf(params.get("rUrl")));
 		//request
-		String oPROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("PROJECT_CODE")));
-		String oINPUT_COMPANY = sUtil.checkNull(String.valueOf(request.getParameter("INPUT_COMPANY")));
-		String oDEPT = sUtil.checkNull(String.valueOf(request.getParameter("DEPT")));
-		String oADMIN_NAME = sUtil.checkNull(String.valueOf(request.getParameter("ADMIN_NAME")));
-		String oEMAIL = sUtil.checkNull(String.valueOf(request.getParameter("EMAIL")));
-		String oTEL = sUtil.checkNull(String.valueOf(params.get("TEL")));
-		String oPHONE = sUtil.checkNull(String.valueOf(params.get("PHONE")));
-		String oSEARCHDATE = sUtil.checkNull(String.valueOf(params.get("SEARCHDATE")));
-		String oINPUTDATE = wUtil.getToday();
-		String oPROJECT_NAME = sUtil.checkNull(String.valueOf(request.getParameter("PROJECT_NAME")));
-		String oHOLE_NUMBER = sUtil.checkNull(String.valueOf(params.get("HOLE_NUMBER")));
-		String oHOLE_ADMIN_NAME= sUtil.checkNull(String.valueOf(request.getParameter("HOLE_ADMIN_NAME")));
-		String oHOLE_COMPANY = sUtil.checkNull(String.valueOf(request.getParameter("HOLE_COMPANY")));
-		String oHOLE_TYPE = "Boring";
-		String oHOLE_SPOT_SD = sUtil.checkNull(String.valueOf(params.get("HOLE_SPOT_SD")));
-		String oHOLE_SPOT_SGG = sUtil.checkNull(String.valueOf(params.get("HOLE_SPOT_SGG")));
-		String oHOLE_SPOT = sUtil.checkNull(String.valueOf(request.getParameter("HOLE_SPOT")));
-		String oREMARK = sUtil.checkNull(String.valueOf(request.getParameter("REMARK")));
-		String oREPORT_TYPE=sUtil.checkNull(String.valueOf(params.get("REPORT_TYPE")));
+		String oPROJECT_CODE 					= sUtil.checkNull(String.valueOf(params.get("PROJECT_CODE")));
+		String oINPUT_COMPANY 					= sUtil.checkNull(String.valueOf(request.getParameter("INPUT_COMPANY")));
+		String oDEPT 							= sUtil.checkNull(String.valueOf(request.getParameter("DEPT")));
+		String oADMIN_NAME 						= sUtil.checkNull(String.valueOf(request.getParameter("ADMIN_NAME")));
+		String oEMAIL 							= sUtil.checkNull(String.valueOf(request.getParameter("EMAIL")));
+		String oTEL 							= sUtil.checkNull(String.valueOf(params.get("TEL")));
+		String oPHONE 							= sUtil.checkNull(String.valueOf(params.get("PHONE")));
+		String oSEARCHDATE 						= sUtil.checkNull(String.valueOf(params.get("SEARCHDATE")));
+		String oINPUTDATE 						= wUtil.getToday();
+		String oPROJECT_NAME 					= sUtil.checkNull(String.valueOf(request.getParameter("PROJECT_NAME")));
+		String oHOLE_NUMBER 					= sUtil.checkNull(String.valueOf(params.get("HOLE_NUMBER")));
+		String oHOLE_ADMIN_NAME 				= sUtil.checkNull(String.valueOf(request.getParameter("HOLE_ADMIN_NAME")));
+		String oHOLE_COMPANY 					= sUtil.checkNull(String.valueOf(request.getParameter("HOLE_COMPANY")));
+		String oHOLE_TYPE 						= "Boring";
+		String oHOLE_SPOT_SD 					= sUtil.checkNull(String.valueOf(params.get("HOLE_SPOT_SD")));
+		String oHOLE_SPOT_SGG 					= sUtil.checkNull(String.valueOf(params.get("HOLE_SPOT_SGG")));
+		String oHOLE_SPOT 						= sUtil.checkNull(String.valueOf(request.getParameter("HOLE_SPOT")));
+		String oREMARK 							= sUtil.checkNull(String.valueOf(request.getParameter("REMARK")));
+		String oREPORT_TYPE						=sUtil.checkNull(String.valueOf(params.get("REPORT_TYPE")));
+		String oTEMP_CONSTRUCT_SITE_INFO_CID	=sUtil.checkNull(String.valueOf(params.get("TEMP_CONSTRUCT_SITE_INFO-CID")));  // 발주기관에서 생성한 프로젝트 식별 번호. TEMP_CONSTRUCT_SITE_INFO 테이블의 cid 컬럼 값.
 		if("".equals(oPROJECT_CODE)){
 			HashMap prjCd = new HashMap();
 			prjCd=masterService.getProjectCd(params);
@@ -185,7 +197,7 @@ public class ProjectListController {
 			model.addObject("result", "false");
 			model.addObject("message", "해당 사업명이 이미 있습니다. 다른 사업명으로 입력 해주세요.");
 			model.setViewName("redirect:/index_db.do");
-			return null;
+			return model;
 		}
 
 		affectRow = masterService.insertMeta(params);
@@ -216,6 +228,17 @@ public class ProjectListController {
 			params.put("USERID",request.getSession().getAttribute("USERID"));
 			affectRow =masterService.updateMeta(params);
 		}
+		
+		if( oTEMP_CONSTRUCT_SITE_INFO_CID != null ) {
+
+			params.put("PROJECT_CODE", oPROJECT_CODE);
+			params.put("CID", oTEMP_CONSTRUCT_SITE_INFO_CID);
+			params.put("PROJECT_STATE_CODE", 1); // 입력상태 1 = 입력 중 하드코딩되어있음. src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java의 drillingInquiryList 메소드 참고.
+			
+			drillingInputService.updateProjectCodeAndProjectStateCodeByCid(request, params);
+			// TEMP_CONSTRUCT_SITE_INFO 테이블의 cid 해당하는 record의 PROJECT_CODE를 update한다.
+		}
+		
 		model.addObject("result", "true");
 		model.addObject("oREPORT_TYPE", oREPORT_TYPE);
 		model.addObject("affectRow", affectRow);
@@ -226,306 +249,356 @@ public class ProjectListController {
 		return model;
 	}
 
-			// 지반정보등록 (관리자)
-						@RequestMapping(value = "/deleteAll.do")
-						public ModelAndView deleteAll(@RequestParam HashMap<String,Object> params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response) throws Exception{
-							strUtil sUtil = new strUtil();
-							int affectRow = 0;
-							UrlPathHelper urlPathHelper = new UrlPathHelper();
-							String topPath = urlPathHelper.getOriginatingRequestUri(request);
-							String PROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("PROJECT_CODE")));
+	// 지반정보등록 (관리자)
+	@RequestMapping(value = "/deleteAll.do")
+	public ModelAndView deleteAll(@RequestParam HashMap<String,Object> params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response) throws Exception{
+		strUtil sUtil = new strUtil();
+		int affectRow = 0;
+		UrlPathHelper urlPathHelper = new UrlPathHelper();
+		String topPath = urlPathHelper.getOriginatingRequestUri(request);
+		String PROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("PROJECT_CODE")));
 
-							// 2018-11-07 모의해킹 조치. 조현석 차장.
-							// 1. 프로젝트 코드 검사 유무
-							if ( null != PROJECT_CODE && ! "".equals(PROJECT_CODE)) {
-								// 2. 관리자인지.
-								boolean ischk = false;
-								if ( request.getSession().getAttribute("CLS") != null && "9".equals(request.getSession().getAttribute("CLS") ) ) {
-									ischk = true;
-								}
-								if ( request.getSession().getAttribute("CLS") != null && "1".equals(request.getSession().getAttribute("CLS") ) ) {
-									// 기업회원일 경우 본인 프로젝트인지 확인.
-									String userId = (String) request.getSession().getAttribute("USERID");
-									if ( userId != null && ! "".equals(userId)) {
-										HashMap projectMap = masterService.getInfo(params);
-										if ( projectMap != null && ! projectMap.isEmpty() ) {
-											String tmpID = (String) projectMap.get("USERID");
-											System.out.println("userId - " + userId + " , tmpID = " + tmpID );
-											// 프로젝트 생성 아이디가 같다면 삭제 권한 가능..
-											if ( userId.equals( tmpID ) ) {
-												ischk = true;
-											}
-										}
-									}
-									//getInfo
-								}
-
-								//3. 권한이 있는 경우에만 삭제가 가능하다.
-								if ( ischk ) {
-									String  tableTemp[]  = {"TEMP_META_INFO", "TEMP_PROJECT_INFO", "TEMP_TOPO_GEOLOGY", "TEMP_HEADER", "TEMP_HEADER_CORE",
-											"TEMP_SELECTCLASS_INFO", "TEMP_REFERENCE", "TEMP_LAYER_INFO", "TEMP_SPT", "TEMP_RQD", "TEMP_DSF",
-											"TEMP_FIELD_PRESSUREMETER", "TEMP_SLICKENSIDE_INFO", "TEMP_Q", "TEMP_RMR", "TEMP_FIELD_WATERPRESSURE",
-											"TEMP_WP_TEST", "TEMP_FIELD_PERMEABILITY", "TEMP_FIELDPER_SUB", "TEMP_FIELD_CONE_PENETRATION",
-											"TEMP_CONE_PENETRATION_IMAGES", "TEMP_SAMPLE_INFO", "TEMP_CLASSIFICATION", "TEMP_CONSOLIDATION_USUAL",
-											"TEMP_CONSOLIDATION", "TEMP_CBR_COMPAC", "TEMP_UNCONFINED_USUAL", "TEMP_TRIAXIAL_USUAL", "TEMP_TRIAXIAL_CU",
-											"TEMP_TRIAXIAL_UU", "TEMP_RESONANT_USUAL", "TEMP_RESONANT", "TEMP_REPEATED_TRIAXIAL_USUAL",
-											"TEMP_REPEATED_TRIAXIAL", "TEMP_ROCK_POINTLOAD", "TEMP_ROCK_JOINTSHEAR", "TEMP_ROCK_UNIAXIAL",
-											"TEMP_ROCK_TRIAXIAL", "TEMP_ROCK_RESONANT_USUAL", "TEMP_ROCK_RESONANT", "TEMP_ROCK_REPEATED_TRIAXIAL_U",
-											"TEMP_ROCK_REPEATED_TRIAXIAL", "TEMP_EXPERT_OPINION", "TEMP_RESISTIVITY_SURVEY", "TEMP_RESISTIVITY_SURVEY_SUB",
-											"TEMP_RESISTIVITY_SURVEY_FILE", "TEMP_REFRACTION_SURVEY", "TEMP_REFRACTION_SURVEY_SUB",
-											"TEMP_REFRACTION_SURVEY_FILE", "TEMP_BOREHOLE_WAVE", "TEMP_BOREHOLE_WAVE_PS", "TEMP_DOWNHOLE",
-											"TEMP_DOWNHOLE_PS", "TEMP_DENSITY", "TEMP_DENSITY_SUB"};
-									params.put("PROJECT_CODE", PROJECT_CODE);
-									for(int i = 0; i<tableTemp.length;i++){
-										params.put("tableName", tableTemp[i]);
-										affectRow += masterService.deleteProject(params);
-									}
-									affectRow += masterService.deleteWebData(params);
-									model.addObject("MODE", "DEL");
-									model.addObject("affectRow", affectRow);
-									model.addObject("PROJECT_CODE", PROJECT_CODE);
-									model.setViewName("redirect:/index_db.do");
-								} else {
-									model.addObject("MODE", "DEL");
-									model.addObject("affectRow", -1);
-									model.addObject("PROJECT_CODE", PROJECT_CODE);
-									model.setViewName("redirect:/index_db.do");
-								}
-
-							} else {
-								model.addObject("MODE", "DEL");
-								model.addObject("affectRow", 0);
-								model.addObject("PROJECT_CODE", null);
-								model.setViewName("redirect:/index_db.do");
-							}
-
-							return model;
+		// 2018-11-07 모의해킹 조치. 조현석 차장.
+		// 1. 프로젝트 코드 검사 유무
+		if ( null != PROJECT_CODE && ! "".equals(PROJECT_CODE)) {
+			// 2. 관리자인지.
+			boolean ischk = false;
+			if ( request.getSession().getAttribute("CLS") != null && "9".equals(request.getSession().getAttribute("CLS") ) ) {
+				ischk = true;
+			}
+			if ( request.getSession().getAttribute("CLS") != null && "1".equals(request.getSession().getAttribute("CLS") ) ) {
+				// 기업회원일 경우 본인 프로젝트인지 확인.
+				String userId = (String) request.getSession().getAttribute("USERID");
+				if ( userId != null && ! "".equals(userId)) {
+					HashMap projectMap = masterService.getInfo(params);
+					if ( projectMap != null && ! projectMap.isEmpty() ) {
+						String tmpID = (String) projectMap.get("USERID");
+						System.out.println("userId - " + userId + " , tmpID = " + tmpID );
+						// 프로젝트 생성 아이디가 같다면 삭제 권한 가능..
+						if ( userId.equals( tmpID ) ) {
+							ischk = true;
 						}
+					}
+				}
+				//getInfo
+			}
 
-						// 수정요청 팝업(List)
-						@RequestMapping(value = "/index_db.do")
-						public String index_db(@RequestParam HashMap<String, Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response)throws Exception {
-							strUtil sUtil = new strUtil();
+			//3. 권한이 있는 경우에만 삭제가 가능하다.
+			if ( ischk ) {
+				String  tableTemp[]  = {"TEMP_META_INFO", "TEMP_PROJECT_INFO", "TEMP_TOPO_GEOLOGY", "TEMP_HEADER", "TEMP_HEADER_CORE",
+						"TEMP_SELECTCLASS_INFO", "TEMP_REFERENCE", "TEMP_LAYER_INFO", "TEMP_SPT", "TEMP_RQD", "TEMP_DSF",
+						"TEMP_FIELD_PRESSUREMETER", "TEMP_SLICKENSIDE_INFO", "TEMP_Q", "TEMP_RMR", "TEMP_FIELD_WATERPRESSURE",
+						"TEMP_WP_TEST", "TEMP_FIELD_PERMEABILITY", "TEMP_FIELDPER_SUB", "TEMP_FIELD_CONE_PENETRATION",
+						"TEMP_CONE_PENETRATION_IMAGES", "TEMP_SAMPLE_INFO", "TEMP_CLASSIFICATION", "TEMP_CONSOLIDATION_USUAL",
+						"TEMP_CONSOLIDATION", "TEMP_CBR_COMPAC", "TEMP_UNCONFINED_USUAL", "TEMP_TRIAXIAL_USUAL", "TEMP_TRIAXIAL_CU",
+						"TEMP_TRIAXIAL_UU", "TEMP_RESONANT_USUAL", "TEMP_RESONANT", "TEMP_REPEATED_TRIAXIAL_USUAL",
+						"TEMP_REPEATED_TRIAXIAL", "TEMP_ROCK_POINTLOAD", "TEMP_ROCK_JOINTSHEAR", "TEMP_ROCK_UNIAXIAL",
+						"TEMP_ROCK_TRIAXIAL", "TEMP_ROCK_RESONANT_USUAL", "TEMP_ROCK_RESONANT", "TEMP_ROCK_REPEATED_TRIAXIAL_U",
+						"TEMP_ROCK_REPEATED_TRIAXIAL", "TEMP_EXPERT_OPINION", "TEMP_RESISTIVITY_SURVEY", "TEMP_RESISTIVITY_SURVEY_SUB",
+						"TEMP_RESISTIVITY_SURVEY_FILE", "TEMP_REFRACTION_SURVEY", "TEMP_REFRACTION_SURVEY_SUB",
+						"TEMP_REFRACTION_SURVEY_FILE", "TEMP_BOREHOLE_WAVE", "TEMP_BOREHOLE_WAVE_PS", "TEMP_DOWNHOLE",
+						"TEMP_DOWNHOLE_PS", "TEMP_DENSITY", "TEMP_DENSITY_SUB"};
+				params.put("PROJECT_CODE", PROJECT_CODE);
+				for(int i = 0; i<tableTemp.length;i++){
+					params.put("tableName", tableTemp[i]);
+					affectRow += masterService.deleteProject(params);
+				}
+				affectRow += masterService.deleteWebData(params);
+				
+				//발주기관에서 등록한 프로젝트와 연결이 된 경우, 해당 내용을 초기화 한다.
+				params.put("PROJECT_CODE", null);
+				params.put("WHERE_PROJECT_CODE", PROJECT_CODE);
+				params.put("PROJECT_STATE_CODE", 0); // 입력상태 0 = 미입력. 하드코딩되어있음 -> src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java의 drillingInquiryList 메소드 참고.				
+				drillingInputService.updateProjectCodeAndProjectStateCodeByProjectCode(request, params);
+				
+				model.addObject("MODE", "DEL");
+				model.addObject("affectRow", affectRow);
+				model.addObject("PROJECT_CODE", PROJECT_CODE);
+				model.setViewName("redirect:/index_db.do");
+			} else {
+				model.addObject("MODE", "DEL");
+				model.addObject("affectRow", -1);
+				model.addObject("PROJECT_CODE", PROJECT_CODE);
+				model.setViewName("redirect:/index_db.do");
+			}
 
-							String rUrl = sUtil.checkNull(String.valueOf(params.get("rUrl")));
-							String oREPORT_TYPE = sUtil.checkNull(String.valueOf(params.get("oREPORT_TYPE")));
-							String oPROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("oPROJECT_CODE")));
+		} else {
+			model.addObject("MODE", "DEL");
+			model.addObject("affectRow", 0);
+			model.addObject("PROJECT_CODE", null);
+			model.setViewName("redirect:/index_db.do");
+		}
 
-							if(rUrl.equals("")) {
-								rUrl = "/meta_info.do?REPORT_TYPE="+oREPORT_TYPE+"&PROJECT_CODE="+oPROJECT_CODE;
-							}
-							params.put("rUrl", rUrl);
-							model.addAttribute("test",params);
-							return "/web/index_db";
-						}
+		return model;
+	}
 
-						// 지반정보등록 (관리자 및 사용자)
-						@RequestMapping(value = "/checkList.do")
-						public ModelAndView checkList(@RequestParam HashMap<String,Object> params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response) throws Exception{
-							
-							request.setCharacterEncoding("euc-kr");
-							String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID"));
-							model.addObject("userId", LoginUserId);
-							strUtil sUtil           = new strUtil();
-							WebUtil wUtil 			= new WebUtil();
+	// 수정요청 팝업(List)
+	@RequestMapping(value = "/index_db.do")
+	public String index_db(@RequestParam HashMap<String, Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response)throws Exception {
+		strUtil sUtil = new strUtil();
 
-							//request
-							String  p_code= sUtil.checkNull(String.valueOf(params.get("p_code")));
+		String rUrl = sUtil.checkNull(String.valueOf(params.get("rUrl")));
+		String oREPORT_TYPE = sUtil.checkNull(String.valueOf(params.get("oREPORT_TYPE")));
+		String oPROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("oPROJECT_CODE")));
 
-							int count = 0;
+		if(rUrl.equals("")) {
+			rUrl = "/meta_info.do?REPORT_TYPE="+oREPORT_TYPE+"&PROJECT_CODE="+oPROJECT_CODE;
+		}
+		params.put("rUrl", rUrl);
+		model.addAttribute("test",params);
+		return "/web/index_db";
+	}
 
-							ArrayList arrayMeta = new ArrayList();
-							ArrayList arrayProject = new ArrayList();
-							ArrayList arrayTopo = new ArrayList();
-							ArrayList arrayHeader = new ArrayList();
-							ArrayList arrayLayer = new ArrayList();
-							ArrayList arraySpt = new ArrayList();
-							ArrayList arrayRqd = new ArrayList();
-							ArrayList arrayDsf = new ArrayList();
-							ArrayList arrayMeter = new ArrayList();
-							ArrayList arraySlick = new ArrayList();
-							ArrayList arrayQ = new ArrayList();
-							ArrayList arrayRmr = new ArrayList();
-							ArrayList arrayWater = new ArrayList();
-							ArrayList arrayPer = new ArrayList();
-							ArrayList arrayCone = new ArrayList();
-							ArrayList arraySample = new ArrayList();
-							ArrayList arrayConsolidation = new ArrayList();
-							ArrayList arrayResonant = new ArrayList();
-							ArrayList arrayRT = new ArrayList();
-							ArrayList arrayRockUniaxial = new ArrayList();
-							ArrayList arrayRockTriaxial = new ArrayList();
-							ArrayList arrayRockPointload = new ArrayList();
-							ArrayList arrayRockJointshear = new ArrayList();
-							ArrayList arrayRockResonant = new ArrayList();
-							ArrayList arrayRockRT = new ArrayList();
-							ArrayList arrayBorehole = new ArrayList();
-							ArrayList arrayDownhole = new ArrayList();
-							ArrayList arrayDensity = new ArrayList();
-							ArrayList arrayResistivity = new ArrayList();
-							ArrayList arrayRefraction = new ArrayList();
-							ArrayList arrayExpert = new ArrayList();
-							HashMap result = new HashMap();
+	// 지반정보등록 (관리자 및 사용자)
+	@RequestMapping(value = "/checkList.do")
+	public ModelAndView checkList(@RequestParam HashMap<String,Object> params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response) throws Exception{
+		
+		request.setCharacterEncoding("euc-kr");
+		String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID"));
+		model.addObject("userId", LoginUserId);
+		strUtil sUtil           = new strUtil();
+		WebUtil wUtil 			= new WebUtil();
 
-							params.put("PROJECT_CODE", p_code);
+		//request
+		String  p_code= sUtil.checkNull(String.valueOf(params.get("p_code")));
 
-							//프로젝트명, 측선수, 시추공수
-							result = masterService.getInfo(params);
-							model.addObject("result", result);
-							//메타정보
-							arrayMeta = masterService.getProjectMetaInfo(params);
-							model.addObject("arrayMeta", arrayMeta);
-							//프로젝트정보
-							arrayProject = masterService.getProjectInfo(params);
-							model.addObject("arrayProject", arrayProject);
+		int count = 0;
 
-							//지형지질정보
-							arrayTopo = masterService.getTopoGeology(params);
-							model.addObject("arrayTopo", arrayTopo);
+		ArrayList arrayMeta = new ArrayList();
+		ArrayList arrayProject = new ArrayList();
+		ArrayList arrayTopo = new ArrayList();
+		ArrayList arrayHeader = new ArrayList();
+		ArrayList arrayLayer = new ArrayList();
+		ArrayList arraySpt = new ArrayList();
+		ArrayList arrayRqd = new ArrayList();
+		ArrayList arrayDsf = new ArrayList();
+		ArrayList arrayMeter = new ArrayList();
+		ArrayList arraySlick = new ArrayList();
+		ArrayList arrayQ = new ArrayList();
+		ArrayList arrayRmr = new ArrayList();
+		ArrayList arrayWater = new ArrayList();
+		ArrayList arrayPer = new ArrayList();
+		ArrayList arrayCone = new ArrayList();
+		ArrayList arraySample = new ArrayList();
+		ArrayList arrayConsolidation = new ArrayList();
+		ArrayList arrayResonant = new ArrayList();
+		ArrayList arrayRT = new ArrayList();
+		ArrayList arrayRockUniaxial = new ArrayList();
+		ArrayList arrayRockTriaxial = new ArrayList();
+		ArrayList arrayRockPointload = new ArrayList();
+		ArrayList arrayRockJointshear = new ArrayList();
+		ArrayList arrayRockResonant = new ArrayList();
+		ArrayList arrayRockRT = new ArrayList();
+		ArrayList arrayBorehole = new ArrayList();
+		ArrayList arrayDownhole = new ArrayList();
+		ArrayList arrayDensity = new ArrayList();
+		ArrayList arrayResistivity = new ArrayList();
+		ArrayList arrayRefraction = new ArrayList();
+		ArrayList arrayExpert = new ArrayList();
+		HashMap result = new HashMap();
 
-							//시추공정보
-							arrayHeader = masterService.getHeader(params);
-							model.addObject("arrayHeader", arrayHeader);
+		params.put("PROJECT_CODE", p_code);
 
-							//지층정보
-							arrayLayer = masterService.getLayerInfo(params);
-							model.addObject("arrayLayer", arrayLayer);
+		//프로젝트명, 측선수, 시추공수
+		result = masterService.getInfo(params);
+		model.addObject("result", result);
+		//메타정보
+		arrayMeta = masterService.getProjectMetaInfo(params);
+		model.addObject("arrayMeta", arrayMeta);
+		//프로젝트정보
+		arrayProject = masterService.getProjectInfo(params);
+		model.addObject("arrayProject", arrayProject);
 
-							//표준관입시험
-							arraySpt = masterService.getSpt(params);
-							model.addObject("arraySpt", arraySpt);
+		//지형지질정보
+		arrayTopo = masterService.getTopoGeology(params);
+		model.addObject("arrayTopo", arrayTopo);
 
-							//TCRRQD
-							arrayRqd = masterService.getRqd(params);
-							model.addObject("arrayRqd", arrayRqd);
+		//시추공정보
+		arrayHeader = masterService.getHeader(params);
+		model.addObject("arrayHeader", arrayHeader);
 
-							//DSF
-							arrayDsf = masterService.getDsf(params);
-							model.addObject("arrayDsf", arrayDsf);
+		//지층정보
+		arrayLayer = masterService.getLayerInfo(params);
+		model.addObject("arrayLayer", arrayLayer);
 
-							//공내재하
-							arrayMeter = masterService.getFieldPressuremeter(params);
-							model.addObject("arrayMeter", arrayMeter);
+		//표준관입시험
+		arraySpt = masterService.getSpt(params);
+		model.addObject("arraySpt", arraySpt);
 
-							//절리정보
-							arraySlick = masterService.getSlickensideInfo(params);
-							model.addObject("arraySlick", arraySlick);
+		//TCRRQD
+		arrayRqd = masterService.getRqd(params);
+		model.addObject("arrayRqd", arrayRqd);
 
-							//Q
-							arrayQ = masterService.getQ(params);
-							model.addObject("arrayQ", arrayQ);
+		//DSF
+		arrayDsf = masterService.getDsf(params);
+		model.addObject("arrayDsf", arrayDsf);
 
-							//RMR
-							arrayRmr = masterService.getRmr(params);
+		//공내재하
+		arrayMeter = masterService.getFieldPressuremeter(params);
+		model.addObject("arrayMeter", arrayMeter);
 
-							//현장수압
-							arrayWater = masterService.getFieldWaterpressure(params);
+		//절리정보
+		arraySlick = masterService.getSlickensideInfo(params);
+		model.addObject("arraySlick", arraySlick);
 
-							//현장투수
-							arrayPer = masterService.getFieldPermeability(params);
+		//Q
+		arrayQ = masterService.getQ(params);
+		model.addObject("arrayQ", arrayQ);
 
-							//콘관입
-							arrayCone = masterService.getConePenetration(params);
+		//RMR
+		arrayRmr = masterService.getRmr(params);
 
-							//기본물성시험
-							arraySample = masterService.getSampleInfo(params);
-							model.addObject("arraySample", arraySample);
+		//현장수압
+		arrayWater = masterService.getFieldWaterpressure(params);
 
-							//토사 - 압밀시험
-							arrayConsolidation = masterService.getConsolidation(params);
+		//현장투수
+		arrayPer = masterService.getFieldPermeability(params);
 
-							//토사 - 공진주
-							arrayResonant = masterService.getResonant(params);
+		//콘관입
+		arrayCone = masterService.getConePenetration(params);
 
-							//토사 - 반복삼축
-							arrayRT = masterService.getRepeatedTriaxial(params);
+		//기본물성시험
+		arraySample = masterService.getSampleInfo(params);
+		model.addObject("arraySample", arraySample);
 
-							//암석 - 일축압축
-							arrayRockUniaxial = masterService.getRockUniaxial(params);
+		//토사 - 압밀시험
+		arrayConsolidation = masterService.getConsolidation(params);
 
-							//암석 - 삼축압축
-							arrayRockTriaxial = masterService.getRockTriaxial(params);
+		//토사 - 공진주
+		arrayResonant = masterService.getResonant(params);
 
-							//암석 - 점하중
-							arrayRockPointload = masterService.getRockPointload(params);
+		//토사 - 반복삼축
+		arrayRT = masterService.getRepeatedTriaxial(params);
 
-							//암석 - 절리면전단
-							arrayRockJointshear = masterService.getRockJointshear(params);
+		//암석 - 일축압축
+		arrayRockUniaxial = masterService.getRockUniaxial(params);
 
-							//암석 - 공진주
-							arrayRockResonant = masterService.getRockResonant(params);
+		//암석 - 삼축압축
+		arrayRockTriaxial = masterService.getRockTriaxial(params);
 
-							//암석 - 반복삼축
-							arrayRockRT = masterService.getRockRepeatedTriaxial(params);
+		//암석 - 점하중
+		arrayRockPointload = masterService.getRockPointload(params);
 
-							//PS검층
-							arrayBorehole = masterService.getBorehole(params);
+		//암석 - 절리면전단
+		arrayRockJointshear = masterService.getRockJointshear(params);
 
-							//하향식 탄성파
-							arrayDownhole = masterService.getDownhole(params);
+		//암석 - 공진주
+		arrayRockResonant = masterService.getRockResonant(params);
 
-							//밀도검층
-							arrayDensity = masterService.getDensity(params);
+		//암석 - 반복삼축
+		arrayRockRT = masterService.getRockRepeatedTriaxial(params);
 
-							//전기비저항
-							arrayResistivity = masterService.getResistivity(params);
+		//PS검층
+		arrayBorehole = masterService.getBorehole(params);
 
-							//굴절법탄성파
-							arrayRefraction = masterService.getRefraction(params);
+		//하향식 탄성파
+		arrayDownhole = masterService.getDownhole(params);
 
-							//전문가의견
-							arrayExpert = masterService.getExpertOpinion(params);
+		//밀도검층
+		arrayDensity = masterService.getDensity(params);
 
-							EgovMap sampleInfoExYn = headerService.sampleInfoException(params);
-							sampleInfoExYn.put("sampleInfoException", (sampleInfoExYn.get("sampleInfoException") != null) ? sampleInfoExYn.get("sampleInfoException") : "N");
-							model.addObject("sampleInfoExYn", sampleInfoExYn);
-							model.addObject("arrayExpert", arrayExpert);
-							model.setViewName("/web/project/checklist");
-							return model;
-						}
+		//전기비저항
+		arrayResistivity = masterService.getResistivity(params);
 
-						// 지반정보등록 (관리자)
-						@RequestMapping(value = "/checkListDb.do")
-						public ModelAndView checkListDb(@RequestParam HashMap<String,Object> params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response) throws Exception{
-							WebUtil wUtil = new WebUtil();
-							strUtil sUtil = new strUtil();
-							int affectRow = 0;
+		//굴절법탄성파
+		arrayRefraction = masterService.getRefraction(params);
 
-							//request
-							String REPORT_TYPE = sUtil.checkNull(String.valueOf(params.get("REPORT_TYPE")));
-							String PROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("PROJECT_CODE")));
-							String MODE = sUtil.checkNull(String.valueOf(params.get("MODE")));
+		//전문가의견
+		arrayExpert = masterService.getExpertOpinion(params);
 
-								//등록
-								if("".equals(PROJECT_CODE)== false && "SUC".equals(MODE) == true){
+		EgovMap sampleInfoExYn = headerService.sampleInfoException(params);
+		sampleInfoExYn.put("sampleInfoException", (sampleInfoExYn.get("sampleInfoException") != null) ? sampleInfoExYn.get("sampleInfoException") : "N");
+		model.addObject("sampleInfoExYn", sampleInfoExYn);
+		model.addObject("arrayExpert", arrayExpert);
+		model.setViewName("/web/project/checklist");
+		return model;
+	}
 
-									//UPDATE
-									params.put("temp", "up");
-									params.put("STATE", "1");
-									params.put("PROJECT_CODE", PROJECT_CODE);
-									affectRow = masterService.updateMeta(params);
+	// 지반정보등록 (관리자)
+	@RequestMapping(value = "/checkListDb.do")
+	public ModelAndView checkListDb(@RequestParam HashMap<String,Object> params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response) throws Exception{
+		WebUtil wUtil = new WebUtil();
+		strUtil sUtil = new strUtil();
+		int affectRow = 0;
 
-									//WEB_DATAINPUT에 DATA 저장. 검수준비중으로 insert
+		//request
+		String REPORT_TYPE = sUtil.checkNull(String.valueOf(params.get("REPORT_TYPE")));
+		String PROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("PROJECT_CODE")));
+		String MODE = sUtil.checkNull(String.valueOf(params.get("MODE")));
 
-									params.put("USERID",request.getSession().getAttribute("USERID"));
-									params.put("FILENAME","");
-									affectRow = masterService.insertWebData(params);
-								}
+			//등록
+			if("".equals(PROJECT_CODE)== false && "SUC".equals(MODE) == true){
+
+				//UPDATE
+				params.put("temp", "up");
+				params.put("STATE", "1");
+				params.put("PROJECT_CODE", PROJECT_CODE);
+				affectRow = masterService.updateMeta(params);
+
+				//WEB_DATAINPUT에 DATA 저장. 검수준비중으로 insert
+
+				params.put("USERID",request.getSession().getAttribute("USERID"));
+				params.put("FILENAME","");
+				affectRow = masterService.insertWebData(params);
+				
+				// 발주기관의 프로젝트의 상탯값도 갱신한다.
+				params.put("PROJECT_CODE", PROJECT_CODE);
+				params.put("WHERE_PROJECT_CODE", PROJECT_CODE);
+				params.put("PROJECT_STATE_CODE", 2); // 입력상태 2 = 검수 준비 대기중. 하드코딩되어있음 -> src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java의 drillingInquiryList 메소드 참고.				
+				drillingInputService.updateProjectCodeAndProjectStateCodeByProjectCode(request, params);
+			}
 
 
-							model.addObject("MODE", "SUC");
-							model.addObject("affectRow", affectRow);
-							model.addObject("PROJECT_CODE", PROJECT_CODE);
-							model.setViewName("redirect:/checkListRDb.do");
-							return model;
-						}
+		model.addObject("MODE", "SUC");
+		model.addObject("affectRow", affectRow);
+		model.addObject("PROJECT_CODE", PROJECT_CODE);
+		model.setViewName("redirect:/checkListRDb.do");
+		return model;
+	}
+
+	// 수정요청 팝업(List)
+	@RequestMapping(value = "/checkListRDb.do")
+	public String checkListRDb(@RequestParam HashMap<String, Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response)throws Exception {
+		model.addAttribute("test",params);
+		return "/web/project/checklist_db";
+	}
+	
+	
+	// 발주기관 프로젝트목록 가져오기
+	@ResponseBody
+	@RequestMapping(value = "/drilling-project-list", method = RequestMethod.GET, produces = "application/json; charset=UTF-8")
+	public String getDrillingProjectList(HttpServletRequest request, HttpServletResponse response, @RequestParam HashMap<String,Object> params) throws Exception {
+
+		JSONObject jsonObject = new JSONObject();
+		strUtil sUtil = new strUtil();
+
+		String projectName = sUtil.checkNull((String)params.get("projectName"));	
+
+		JSONArray jsonListObject = new JSONArray();
+		
+		if( projectName == ""){			
+			jsonObject.put("resultMessage", "OK");
+			jsonObject.put("resultCode", 200);
+			jsonObject.put("result", new JSONObject().put("list", jsonListObject));			
+		} else {			
+			JSONObject result = new JSONObject();
+			result.put("list", drillingInquiryService.drillingInquiryAutocompleteList(request, params));
+			
+			jsonObject.put("resultMessage", "OK");
+			jsonObject.put("resultCode", 200);
+			jsonObject.put("result", result);
+		}
+		
+		response.setContentType("application/json; charset=UTF-8"); // 응답 헤더 설정
+		response.setCharacterEncoding("UTF-8"); // 응답 데이터 인코딩 설정 (중요)
+		
+		try (OutputStream os = response.getOutputStream()) { // OutputStream 사용
+			os.write(jsonObject.toString().getBytes("UTF-8")); // UTF-8 인코딩하여 출력
+		}
+		
+		return null; // @ResponseBody이므로 반환 값은 필요 없습니다.
+	}
 
-						// 수정요청 팝업(List)
-						@RequestMapping(value = "/checkListRDb.do")
-						public String checkListRDb(@RequestParam HashMap<String, Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response)throws Exception {
-							model.addAttribute("test",params);
-							return "/web/project/checklist_db";
-						}
 
 }
 

src/main/java/geoinfo/regi/status/RegiController.java

@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.jfree.util.Log;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -34,6 +35,7 @@ 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.map.mapControl.service.MapControlService;
 import geoinfo.regi.selectClassInfo.service.SelectClassService;
 import geoinfo.regi.status.service.RegiPageService;
@@ -56,6 +58,9 @@ public class RegiController {
 
 	@Resource(name = "mapControlService")
 	private MapControlService mapControlService;
+	
+	@Autowired
+	private DrillingInputService drillingInputService;
 
 	//	지반정보 입력시스템 - 프로젝트 현황
 	@RequestMapping(value = "/webManage.do")
@@ -560,6 +565,8 @@ public class RegiController {
 
 		return "/web/manage/list_db";
 	}
+	
+	
 	// 지반정보등록(일반)
 	@RequestMapping(value = "/listDb.do")
 	public String listDb(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -615,6 +622,15 @@ public class RegiController {
 
 				// -------------------------------------------------------
 				// WEB_DATAINPUT STATE UPDATE End
+				
+				
+				// 발주기관의 프로젝트의 상탯값도 갱신한다.
+				params.put("PROJECT_CODE", PROJECT_CODE);
+				params.put("WHERE_PROJECT_CODE", PROJECT_CODE);
+				params.put("PROJECT_STATE_CODE", 3); // 입력상태 3 = 검수 중. 하드코딩되어있음 -> src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java의 drillingInquiryList 메소드 참고.				
+				drillingInputService.updateProjectCodeAndProjectStateCodeByProjectCode(request, params);
+				
+				
 
 			} else if ("".equals(PROJECT_CODE) == false && "START_SUB".equals(PROC) == true) {
 				// 수정요청중인 데이터 강제 진행처리
@@ -643,6 +659,12 @@ public class RegiController {
 
 				// -------------------------------------------------------
 				// WEB_DATAINPUT STATE UPDATE End
+				
+				// 발주기관의 프로젝트의 상탯값도 갱신한다.
+				params.put("PROJECT_CODE", PROJECT_CODE);
+				params.put("WHERE_PROJECT_CODE", PROJECT_CODE);
+				params.put("PROJECT_STATE_CODE", 3); // 입력상태 3 = 검수 중. 하드코딩되어있음 -> src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java의 drillingInquiryList 메소드 참고.				
+				drillingInputService.updateProjectCodeAndProjectStateCodeByProjectCode(request, params);
 
 			} else if ("".equals(PROJECT_CODE) == false && "COMPLETE".equals(PROC) == true) {
 
@@ -653,6 +675,13 @@ public class RegiController {
 				// TEMP_MANAGE_STATE COMPLETEDATE UPDATE
 				params.put("STATE", "3"); // 검수완료
 				affectRow += masterService.updateCompletedate(params);
+				
+
+				// 발주기관의 프로젝트의 상탯값도 갱신한다.
+				params.put("PROJECT_CODE", PROJECT_CODE);
+				params.put("WHERE_PROJECT_CODE", PROJECT_CODE);
+				params.put("PROJECT_STATE_CODE", 5); // 입력상태 5 = 검수 완료. 하드코딩되어있음 -> src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java의 drillingInquiryList 메소드 참고.				
+				drillingInputService.updateProjectCodeAndProjectStateCodeByProjectCode(request, params);
 
 			} else if ("".equals(PROJECT_CODE) == false && "CREATE".equals(PROC) == true) {
 
@@ -695,6 +724,12 @@ public class RegiController {
 
 					// -------------------------------------------------------
 					// WEB_DATAINPUT STATE UPDATE End
+					
+					// 발주기관의 프로젝트의 상탯값도 갱신한다.
+					params.put("PROJECT_CODE", PROJECT_CODE);
+					params.put("WHERE_PROJECT_CODE", PROJECT_CODE);
+					params.put("PROJECT_STATE_CODE", 6); // 입력상태 6 = 수정 요청. 하드코딩되어있음 -> src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java의 drillingInquiryList 메소드 참고.				
+					drillingInputService.updateProjectCodeAndProjectStateCodeByProjectCode(request, params);
 
 					//등급 점수계산
 				} else {
@@ -720,6 +755,13 @@ public class RegiController {
 
 				// -------------------------------------------------------
 				// WEB_DATAINPUT STATE UPDATE End
+				
+				
+				// 발주기관의 프로젝트의 상탯값도 갱신한다.
+				params.put("PROJECT_CODE", PROJECT_CODE);
+				params.put("WHERE_PROJECT_CODE", PROJECT_CODE);
+				params.put("PROJECT_STATE_CODE", 4); // 입력상태 4 = 수정 요청. 하드코딩되어있음 -> src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java의 drillingInquiryList 메소드 참고.				
+				drillingInputService.updateProjectCodeAndProjectStateCodeByProjectCode(request, params);
 			}
 
 

src/main/java/geoinfo/util/MyUtil.java

@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -798,5 +799,39 @@ public final class MyUtil {
 
 		return false;
 	}
+	
+	/**
+	 * Oracle 11g의 CLOB값을 String 값으로 변환한다.
+	 * @param clob
+	 * @return
+	 * @throws SQLException 
+	 */
+	public static String ClobToString(java.sql.Clob clob) throws SQLException {
+		String clobData = "";
+		if (clob != null) {
+		    java.io.Reader reader = clob.getCharacterStream();
+		    java.io.BufferedReader br = new java.io.BufferedReader(reader);
+		    StringBuilder sb = new StringBuilder();
+		    String line;
+		    try {
+		        while ((line = br.readLine()) != null) {
+		            sb.append(line);
+		            sb.append("\n"); // 필요에 따라 줄바꿈 추가
+		        }
+		        clobData = sb.toString();
+		    } catch (java.io.IOException e) {
+		        e.printStackTrace();
+		        // 오류 처리
+		    } finally {
+		        try {
+		            br.close();
+		            reader.close();
+		        } catch (java.io.IOException e) {
+		            e.printStackTrace();
+		        }
+		    }
+		}
+		return clobData;
+	}
 
 }

src/main/resources/egovframework/sqlmap/mapper/drilling/home/DrillingHomeMapper.xml

@@ -2,5 +2,68 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="geoinfo.drilling.home.service.DrillingHomeMapper">
+
+	<resultMap id="holeLocationResultMap" type="egovMap">
+		<id property="gid" column="GID" />
+		<result property="wkt" column="WKT" javaType="java.lang.String" />
+	</resultMap>
+	<select id="drillingMapSearchHole" parameterType="String" resultMap="holeLocationResultMap">
+		SELECT
+			HOLE.GID,
+			HOLE.HOLE_CODE AS CODE,
+			HOLE.THE_GEOM.GET_WKT() AS WKT
+		FROM TBL_HEADER_HOLE HOLE
+		WHERE HOLE.PROJECT_CODE IN (
+			SELECT TRIM(tpi.PROJECT_CODE)
+			FROM
+				TBL_PROJECT_INFO tpi
+			WHERE
+				tpi.PROJECT_MASTER_COMPANY_CODE IN
+				(
+					SELECT
+						tmc.COM_CODE
+					FROM
+						TBL_MASTER_COMPANY tmc
+					WHERE 
+						tmc.COM_CODE IN (TRIM(#{COM_CODE}))
+				)
+		)
+	</select>
 	
+	
+	<select id="drillingMapSearchHoleWithMbr" parameterType="String" resultMap="holeLocationResultMap">
+		<![CDATA[		
+		
+		SELECT
+			HOLE.GID,
+			HOLE.HOLE_CODE AS CODE,
+			HOLE.THE_GEOM.GET_WKT() AS WKT
+		FROM
+			TBL_HEADER_HOLE HOLE
+		WHERE
+			HOLE.PROJECT_CODE IN (
+				SELECT
+					tpi.PROJECT_CODE
+				FROM
+					TBL_PROJECT_INFO tpi
+				WHERE
+					tpi.PROJECT_MASTER_COMPANY_CODE IN
+					(
+						SELECT
+							tmc.COM_CODE
+						FROM
+							TBL_MASTER_COMPANY tmc
+						WHERE 
+							tmc.COM_CODE IN (
+								TRIM(#{COM_CODE})
+							)
+					)
+			) AND
+			#{MIN_X} <= HOLE.HOLE_LOCATION_TM_X AND
+			#{MIN_Y} <= HOLE.HOLE_LOCATION_TM_Y AND
+			HOLE.HOLE_LOCATION_TM_X <= #{MAX_X} AND
+			HOLE.HOLE_LOCATION_TM_Y <= #{MAX_Y}
+			
+		]]>
+	</select>
 </mapper>

src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml

@@ -59,8 +59,7 @@
 		        #{v_gs, mode=OUT, jdbcType=VARCHAR}, 
 		        #{v_gf, mode=OUT, jdbcType=VARCHAR}
 		    ) }
-	</select>
-	
+	</select>	
 	
 	<select id="getDepartments" parameterType="map" resultType="egovMap">
 		SELECT
@@ -79,6 +78,57 @@
 		FROM DUAL
 	</select>
 	
+	<resultMap id="spUdtTblCsiResult" type="java.util.HashMap"> 
+        <result property="resultCode" column="p_result_code" jdbcType="VARCHAR"/>
+        <result property="errMsg" column="p_err_msg" jdbcType="VARCHAR"/>
+    </resultMap>
+	<select id="spUdtTblCsi" parameterType="map" statementType="CALLABLE" resultMap="spUdtTblCsiResult">
+	{ CALL SP_UDT_TBL_CSI(
+				#{cid},
+		        #{constName},
+		        #{constStartDate},
+		        #{constEndDate},
+		        #{constStateCode},
+		        #{masterCompanyOCode},
+		        #{masterCompanyTwCode},
+		        #{masterCompanyThCode},
+		        #{masterCompanyName},
+		        #{masterCompanyDept},
+		        #{masterCompanyAdmin},
+		        #{masterCompanyTel},
+		        #{constCompanyCode},
+		        #{constCompanyAdmin},
+		        #{constCompanyTel},
+		        #{userId},
+		        #{v_RetCode, mode=OUT, jdbcType=INTEGER}, 
+		        #{v_RetMsg, mode=OUT, jdbcType=VARCHAR}
+		    ) }
+	</select>
 	
+	<select id="sPGetTblCsiByCid" parameterType="map" resultType="egovMap">
+		<![CDATA[
+		select * FROM TABLE(SP_GET_TBL_CSI_BY_CID(#{CID}))
+		]]>
+	</select>
+	
+	<select id="getItemByCid" parameterType="map" resultType="egovMap">
+		<![CDATA[
+		SELECT * FROM TEMP_CONSTRUCT_SITE_INFO WHERE TRIM(CID) = #{CID}
+		]]>
+	</select>
+	
+	
+	
+	<update id="updateProjectCodeAndProjectStateCodeByCid" parameterType="map">
+		<![CDATA[
+			UPDATE TEMP_CONSTRUCT_SITE_INFO SET PROJECT_CODE = #{PROJECT_CODE}, PROJECT_STATE_CODE= #{PROJECT_STATE_CODE} WHERE TRIM(CID) = #{CID} AND PROJECT_CODE IS NULL
+		]]>
+	</update>
+	
+	<update id="updateProjectCodeAndProjectStateCodeByProjectCode" parameterType="map">
+		<![CDATA[
+			UPDATE TEMP_CONSTRUCT_SITE_INFO SET PROJECT_CODE = #{PROJECT_CODE}, PROJECT_STATE_CODE= #{PROJECT_STATE_CODE} WHERE TRIM(PROJECT_CODE) = #{WHERE_PROJECT_CODE}
+		]]>
+	</update>
 	
 </mapper>

src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml

@@ -46,5 +46,69 @@
 		    ) }
 	</select>
 	
+	<select id="drillingInquiryAutocompleteList" parameterType="map" resultType="egovMap">
+		SELECT
+			tgld.GL_DISTRICT,
+			tgmd.GM_DISTRICT,
+			tgsd.GS_DISTRICT,
+			tcsi.CID,
+			tcsi.CONST_NAME
+		FROM
+			TEMP_CONSTRUCT_SITE_INFO tcsi
+		LEFT JOIN (
+			SELECT
+				*
+			FROM
+				tbl_gl_district
+			WHERE
+				use_yn = 'Y'
+			ORDER BY
+				gl_code
+		) tgld ON tcsi.MASTER_COMPANY_O_CODE = tgld.GL_CODE
+		LEFT JOIN (
+			SELECT
+				*
+			FROM
+				tbl_gm_district
+			WHERE
+				use_yn = 'Y'
+			ORDER BY
+				gm_code
+		) tgmd ON tcsi.MASTER_COMPANY_O_CODE = tgmd.GL_CODE AND tcsi.MASTER_COMPANY_TW_CODE = tgmd.GM_CODE
+		LEFT JOIN (
+			SELECT
+				*
+			FROM
+				tbl_gs_district
+			WHERE
+				use_yn = 'Y'
+			ORDER BY
+				gs_code
+		) tgsd ON
+			tcsi.MASTER_COMPANY_O_CODE = tgsd.GL_CODE AND
+			tcsi.MASTER_COMPANY_TW_CODE = tgsd.GM_CODE AND
+			tcsi.MASTER_COMPANY_TH_CODE = tgsd.GS_CODE
+		WHERE
+			tcsi.PROJECT_CODE IS NULL AND
+			tcsi.CONST_NAME LIKE '%' || #{projectName} || '%'
+		ORDER BY tcsi.CRT_DT DESC
+	</select>
+	
+	
+	
+	<select id="getItemByProjectCode" parameterType="map" resultType="egovMap">
+		<![CDATA[
+		SELECT * FROM TEMP_CONSTRUCT_SITE_INFO WHERE TRIM(PROJECT_CODE) = #{PROJECT_CODE}
+		]]>
+	</select>
+	
+	<select id="getTblMasterCompanyMbrByComCode" parameterType="map" resultType="egovMap">
+		<![CDATA[
+		SELECT * FROM TBL_MASTER_COMPANY WHERE TRIM(COM_CODE) = #{COM_CODE}
+		]]>
+	</select>
+	
+	
+	
 	
 </mapper>

src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml

@@ -55,7 +55,7 @@
     		WEB_MEMBER_IN
     	WHERE
     		USERID = #{userId} AND
-    		DUPINFO = #{DI}
+    		(DUPINFO = #{DI} OR DUPINFO IS NULL)
     </select>
 
     <select id="selectWebMemberInLoginCount" parameterType="String" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">

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">
-									<a href="#" onClick="gourlId('cmuboard_read','${row.idx}');" class="int" onfocus="this.blur()">${row.subject}</a>
-									<%-- <a href="javascript:cmuDetail('${row.idx }');">${row.subject}</a> --%>
+								<td class="t-left table-reply">									
+									  <c:choose>
+									    <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">
-									<a href="#" onClick="gourlId('cmuboard_read','${row.idx}');" class="int" onfocus="this.blur()">${row.subject}</a>
-									<%-- <a href="javascript:cmuDetail('${row.idx }');">${row.subject}</a> --%>
+								<td class="t-left">									
+									  <c:choose>
+									    <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> -->
-	<a href="#" onclick="gourl('cmuboard')"><img src="./images/community/cus_bnt_list.gif" align="absmiddle" alt="list"></a>
+    <c:choose>
+	    <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/mypage/passch.jsp

@@ -27,7 +27,7 @@
 					<td class="th-head">신규 비밀번호 <span class="textR">*</span></td>
 					<td class="t-left">
 						<input type="password" name="passwordch" class="join_form" style="width:200px;" maxlength="15">
-						<span class="textR">* 비밀번호는 숫자와 영문자 조합으로 10~15 자리를 사용해야 합니다.</span
+						<span class="textR">* 비밀번호는 숫자와 영문자 조합으로 10~15 자리를 사용해야 합니다.</span>
 					</td>
 				</tr>
 				<tr>

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){
-		document.frm.idx.value = idx;
-		document.frm.action =  "topMenuSelect.do?url=noticeView";
+	function noticeDetail(idx, src) {
+		var documentFrmAction = "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(){
-		document.frm.action =  "topMenuSelect.do?url=notice";
+	function noticeList(src){
+		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">
-		<a href="javascript:noticeList();"><img src="./images/cus_bnt_list.gif"></a>
+	<div class="table-bottom-btn-group">		
+		<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">
-						<i class="fa fa-angle-double-left icon-medium" aria-hidden="true"></i>
-					</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-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 }');" class="navi">
-							${ i }
-						</a>
-
-					</c:forEach>
-					<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>
-					</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:choose>
+					    <c:when test="${not isFromDrillingSystem}">
+					        <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">
+								<i class="fa fa-angle-double-left icon-medium" aria-hidden="true"></i>
+							</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-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 }');" class="navi">
+									${ i }
+								</a>
+		
+							</c:forEach>
+							<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>
+							</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(){
-		document.frm.action =  "topMenuSelect.do?url=pds";
+	function dataList(src){
+		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">
-		<a href="javascript:dataList();"><img src="./images/cus_bnt_list.gif"></a>
+	<div class="table-bottom-btn-group">		
+		<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

@@ -16,13 +16,24 @@
    	<input type="hidden" id="gs-district" name="gs-district" value="" />
    	<input type="hidden" id="gf-district" name="gf-district" value="" />
     <input type="hidden" id="last-team-name" name="last-team-name" value="" />
+    <input type="hidden" id="master-company-code" name="master-company-code" value="<c:out value="${masterCompanyCode}"/>" />
+    <input type="hidden" id="mbr-v-min-x" name="mbr-v-min-x" value="<c:out value="${mbr.v_min_x}"/>" />
+    <input type="hidden" id="mbr-v-max-x" name="mbr-v-max-x" value="<c:out value="${mbr.v_max_x}"/>" />
+    <input type="hidden" id="mbr-v-min-y" name="mbr-v-min-y" value="<c:out value="${mbr.v_min_y}"/>" />
+    <input type="hidden" id="mbr-v-max-y" name="mbr-v-max-y" value="<c:out value="${mbr.v_max_y}"/>" />
+
 
     <!-- header -------------------------------------------->
     <header class="drilling-wrap-header">
         <div id="header_cont">
             <div class="wrap_header_top">
                 <!-- logo -->
-                <h1 class="logo logo-01"><a href="/drilling/index.do">서울지방국토관리청</a></h1>
+                <c:if test="${'025' == masterCompanyCode}">
+                	<h1 class="logo logo-05"><a href="/drilling/index.do">서울지방국토관리청</a></h1>
+                </c:if>
+                <c:if test="${'709' == masterCompanyCode}">
+                	<h1 class="logo logo-03"><a href="/drilling/index.do">서울지방국토관리청</a></h1>
+                </c:if>
                 <!-- //logo -->
                 <div class="search_top_hd">
                     <a href="javascript:void(0)" class="search_btn">검색영역열기</a>
@@ -50,90 +61,17 @@
                     <!-- gnb -->
                     <nav class="gnb" id="gnb">
                         <ul>
-                            <li class="">
-                                <a href='javascript:void(0);' onclick="onClickBtnViewOnMap()">
-                                    지도 보기
+                        	<li class="">
+                                <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="">
@@ -266,7 +204,6 @@
                                             <a href="https://docu.gdoc.go.kr/" target="_blank" title="새창">
                                             <i>문서24</i>
                                             </a>
-                                                
                                     </li>
                                     
                                 </ul>
@@ -274,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">
@@ -326,139 +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>
+							<li class="">
+                                <a href="/logout.do?location=index">
+                                	로그아웃
+                                </a>
+                            </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

@@ -18,7 +18,7 @@
 	                
 	                <img src="/com/img/drilling/maps/01_active.svg" class="my-map rok region" id="my-map-rok-region-01" alt="서울지방국토관리청 영역"title="서울지방국토관리청 영역" />
 	                <div class="region-item" id="region-item-01">
-	                    <div class="region-alone active" id="region-alone-01" title="서울지방국토관리청 영역"></div>
+	                    <div class="region-alone" id="region-alone-01" title="서울지방국토관리청 영역"></div>
 	                    <div class="region-logo" id="region-logo-01" title="서울지방국토관리청"></div>
 	                </div>
 	                
@@ -32,7 +32,16 @@
 	                <img src="/com/img/drilling/maps/03_active.svg" class="my-map rok region" id="my-map-rok-region-03" alt="원주지방국토관리청에 오신것을 진심으로 환영합니다. WONJU REGIONAL OFFICE OF CONSTRUCTION MANAGEMENT" />
 	                <div class="region-item" id="region-item-03">
 	                    <div class="region-logo" id="region-logo-03" title="대전지방국토관리청"></div>
-	                    <div class="region-alone" id="region-alone-03" title="대전지방국토관리청 영역"></div>
+						<c:choose>
+						    <c:when test="${'709' == masterCompanyCode}">
+								<%-- <div class="region-alone active" id="region-alone-03" title="대전지방국토관리청 영역"></div>  --%>
+								<div class="region-alone" id="region-alone-03" title="대전지방국토관리청 영역"></div>
+						    </c:when>
+						    <c:otherwise>
+						        <%-- masterCompanyCode가 '709'가 아닌 경우의 기본 처리 --%>
+							<div class="region-alone" id="region-alone-03" title="대전지방국토관리청 영역"></div>
+						    </c:otherwise>
+						</c:choose>
 	                </div>
 	                
 	                <img src="/com/img/drilling/maps/04_active.svg" class="my-map rok region" id="my-map-rok-region-04" alt="원주지방국토관리청에 오신것을 진심으로 환영합니다. WONJU REGIONAL OFFICE OF CONSTRUCTION MANAGEMENT" />
@@ -43,8 +52,17 @@
 	                
 	                <img src="/com/img/drilling/maps/05_active.svg" class="my-map rok region" id="my-map-rok-region-05" alt="원주지방국토관리청에 오신것을 진심으로 환영합니다. WONJU REGIONAL OFFICE OF CONSTRUCTION MANAGEMENT" />
 	                <div class="region-item" id="region-item-05">
-	                    <div class="region-logo" id="region-logo-05" title="부산지방국토관리청"></div>
-	                    <div class="region-alone" id="region-alone-05" title="부산지방국토관리청 영역"></div>
+	                    <div class="region-logo" id="region-logo-05" title="부산지방국토관리청"></div>	                    
+						<c:choose>
+						    <c:when test="${'025' == masterCompanyCode}">
+						    	<%-- <div class="region-alone active" id="region-alone-05" title="부산지방국토관리청 영역"></div> --%>
+						        <div class="region-alone" id="region-alone-05" title="부산지방국토관리청 영역"></div>
+						    </c:when>
+						    <c:otherwise>
+						        <%-- masterCompanyCode가 '709'가 아닌 경우의 기본 처리 --%>
+						        <div class="region-alone" id="region-alone-05" title="부산지방국토관리청 영역"></div>
+						    </c:otherwise>
+						</c:choose>
 	                </div>
 	                
 	                <img src="/com/img/drilling/maps/02.png" class="my-map rok region" alt="원주지방국토관리청에 오신것을 진심으로 환영합니다. WONJU REGIONAL OFFICE OF CONSTRUCTION MANAGEMENT" />
@@ -57,26 +75,26 @@
 	            <div>
 	                <!-- 메뉴 서비스 -->
 	                <ul class="wrap_service">
-	                    <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="item03"><a href="/drilling/inquiry.do"><i>입력 조회</i></a></li>
-	                    <li class="item04"><a href="/drilling/input.do"><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="item03"><a href="/drilling/inquiry.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">서울 강남구 역삼동 스퀘어 오피스텔 현장</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">2023년 활용통계집 배포</li>
+	                            <li class="project-list-item">종무식 안내</li>
+	                            <li class="project-list-item">시스템 패치로 인한 간헐적 중단 안내</li>
 	                        </ul>
 	                    </div>
 	                </div>
@@ -85,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">
-					<span class="title">개요</span>
-				</a>
+				<c:choose>
+				    <c:when test="${not isFromDrillingSystem}">
+						<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">
-					<span class="title">주요기능</span>
-				</a>
+				<c:choose>
+				    <c:when test="${not isFromDrillingSystem}">
+						<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">
-				<a href="#" onClick="gourl('center3')" onfocus="this.blur()" class="nav-link nav-toggle">
-					<span class="title">오시는길</span>
-				</a>
+			<li class="nav-item">				
+				<c:choose>
+				    <c:when test="${not isFromDrillingSystem}">
+						<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">
-					<span class="title">커뮤니티</span>
-				</a>
+				<c:choose>
+				    <c:when test="${not isFromDrillingSystem}">
+						<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">
-					<span class="title">공지사항</span>
-				</a>
+				<c:choose>
+				    <c:when test="${not isFromDrillingSystem}">
+						<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">
-					<span class="title">자료실</span>
-				</a>
+				<c:choose>
+				    <c:when test="${not isFromDrillingSystem}">
+						<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">
-					<span class="title">시추정보 Q&A</span>
-				</a>
+				<c:choose>
+				    <c:when test="${not isFromDrillingSystem}">
+						<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) {
-		window.location.href="topMenuSelect.do?url="+url;
+	function gourl(url, src) {
+		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) {
-		window.location.href="topMenuSelect.do?url="+url+"&page="+idx;
+	function gourlPage(url, idx, src) {
+		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>		
-		<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>
+	<tr>
+		<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,7 +1287,10 @@ function table3display(){
 
 			// 트리메뉴
 			$("#browser").treeview();
-			autocomplete();
+			
+			if( !getQueryString("masterCompanyCode") ) {
+				autocomplete();
+			}
 
 
 		});
@@ -1334,7 +1337,9 @@ function table3display(){
 					$("#pcompanyame").data("kendoAutoComplete").options.noDataTemplate = '';
 			}else{
 				$("#autotxt").html('자동완성 On');
-				autocompleteOn();
+				if( !getQueryString("masterCompanyCode") ) {
+					autocompleteOn();
+				}
 			}
 		}
 

src/main/webapp/WEB-INF/views/map/mapInformation/sichuDownload.jsp

@@ -17,9 +17,9 @@ function downloadSichu(){
     	this.close();
 }
 </script>
-<c:if test="${params.cnt > 50}">
+<c:if test="${params.cnt > 300}">
 	<script>
-		alert("최대 50개까지 시추공 선택이 가능합니다.");
+		alert("최대 300개까지 시추공 선택이 가능합니다.");
 		opener.closeWaitWin();
 		opener.$("#mask").hide();
 		this.close();

src/main/webapp/WEB-INF/views/web/input/basic/labInfoSlickensideInfo.jsp

@@ -441,8 +441,8 @@ function fn_grid_refresh(){
 												fields: {
 													slickensideDepthFrom: { type: "number" },
 													slickensideDepthTo: { type: "number" },
-													slickensideDirection: { type: "number" },
-													slickensideAngle: { type: "number" },
+													slickensideDirection: { type: "string" },
+													slickensideAngle: { type: "string" },
 													slickensideMax: { type: "string" },
 													slickensideMin: { type: "string" },
 													slickensideAvg: { type: "string" },
@@ -463,8 +463,30 @@ function fn_grid_refresh(){
 													{ field: "slickensideDepthTo", title: "To(m)", editor: chooseEditor, attributes: { style:"text-align: right" }, template: "<div class='td-data'>#= (slickensideDepthTo == null) ? '0' : slickensideDepthTo #</div>" },
 												]
 											},
-											{ field: "slickensideDirection", title: "절리주향", editor: chooseEditor, attributes: { style:"text-align: right" }, template: "<div class='td-data'>#= (slickensideDirection == null) ? '0' : slickensideDirection #</div>" },
-											{ field: "slickensideAngle", title: "절리경사", editor: chooseEditor, attributes: { style:"text-align: right" }, template: "<div class='td-data'>#= (slickensideAngle == null) ? '0' : slickensideAngle #</div>" },
+											{ field: "slickensideDirection", title: "절리주향", editor: chooseEditorAllowHyphen, attributes: { style:"text-align: right" }, 
+													template: function(data) {
+														//"<div class='td-data'>#= (slickensideDirection == null) ? '0' : slickensideDirection #</div>"
+														if( data.slickensideDirection === "") {
+															data.slickensideDirection = "0";
+														} else if( data.slickensideDirection === "-999") {
+															data.slickensideDirection = "-";
+														}
+														var url = "<div class='td-data' data-allow-hyphen='true'>" + data.slickensideDirection + "</div>";
+														return url;
+													}
+											},
+											{ field: "slickensideAngle", title: "절리경사", editor: chooseEditorAllowHyphen, attributes: { style:"text-align: right" },
+													template: function(data) {
+														//"<div class='td-data'>#= (slickensideAngle == null) ? '0' : slickensideAngle #</div>" },
+														if( data.slickensideAngle === "") {
+															data.slickensideAngle = "0";
+														} else if( data.slickensideAngle === "-999") {
+															data.slickensideAngle = "-";
+														}
+														var url = "<div class='td-data' data-allow-hyphen='true'>" + data.slickensideAngle + "</div>";
+														return url;
+													}
+											},
 											{
 												title: "절리간격",
 												columns: [
@@ -560,7 +582,7 @@ function fn_grid_refresh(){
 							<div class="page-explanation page-explanation-sm marT20">
 								<div class="page-explanation-inner">
 									<p class="page-explanation-text">
-										※ 모두 필수 입력입니다. <span class="textR">절리간격 값이 (N/A)</span>인 경우 <span class="textR">-</span>(하이픈)을 기입해주세요.
+										※ 모두 필수 입력입니다. <span class="textR">절리주향, 절리경사, 절리간격 값이 (N/A)</span>인 경우 <span class="textR">-</span>(하이픈)을 기입해주세요.
 									</p>
 								</div>
 							</div>

src/main/webapp/WEB-INF/views/web/input/meta_info1.jsp

@@ -68,6 +68,26 @@
 	  to {bottom: 0; opacity: 0;}
 	}
 	
+	
+  #suggestionList {
+    border: 1px solid #ccc;
+    width: 300px; /* 입력창 너비에 맞춰 조절 */
+    position_: absolute;
+    background-color: white;
+    display: none;
+  }
+  #suggestionList div {
+    padding: 5px;
+    cursor: pointer;
+  }
+  #suggestionList div:hover {
+    background-color: #f0f0f0;
+  }
+  #suggestionList div .organizational-structure {
+    color: red;
+  }
+  
+	
 </style>
 <script type="text/javaScript">
 
@@ -312,6 +332,7 @@ window.onload = function() {
 	});
 	
 	var projectNameInput = document.getElementById("PROJECT_NAME");
+ 	var suggestionListDiv = document.getElementById("suggestionList");
 	projectNameInput.addEventListener('focusout', function() {
 		var projectName = this.value;
 
@@ -332,6 +353,11 @@ window.onload = function() {
 				} else {
 					return true;
 				}
+
+			    // 약간의 딜레이를 주어 suggestionItem의 onclick 이벤트가 먼저 발생하도록 처리
+			    setTimeout(function() {
+			      suggestionListDiv.style.display = "none";
+			    }, 100);
 			},
 			 error: function(xhr, option, error){
 			      alert(xhr.status); //오류코드
@@ -339,6 +365,102 @@ window.onload = function() {
 			}
 		});
 	});
+	
+	
+	  var preProjectList = [
+		    "새로운 웹사이트 개발 프로젝트",
+		    "새로운 나라만들기 프로젝트",
+		    "모바일 앱 개편",
+		    "데이터베이스 마이그레이션",
+		    "클라우드 인프라 구축",
+		    "인공지능 기반 서비스 개발",
+		    "머신러닝 모델 학습",
+		    "빅데이터 분석 플랫폼 구축",
+		    "사이버 보안 강화 프로젝트",
+		    "소프트웨어 품질 개선",
+		    "사용자 인터페이스 디자인 개선"
+		  ];
+
+	 	projectNameInput.onkeyup = function() {
+
+			var projectName = this.value;
+		
+		    if (projectName.length > 0) {
+		      
+		    	$.ajax({
+					type : "GET",
+					data : {
+						projectName : projectName,
+						isProjectNameChecking : "true"
+					},
+					url : "/drilling-project-list.json",
+					dataType : "json",
+					success : function( json ) {
+					    suggestionListDiv.innerHTML = ""; // 이전 목록 비우기
+					    suggestionListDiv.style.display = "none";
+						var list = json.result.list;
+						var matchingProjects = [];
+					      for (var i = 0; i < list.length; i++) {
+					      	matchingProjects.push(list[i]);
+					      }
+					      if (matchingProjects.length > 0) {
+					        for (var i = 0; i < matchingProjects.length; i++) {
+					          var suggestionItem = document.createElement("div");
+					          
+							var organHierarchy 	= 	"	" + matchingProjects[i].glDistrict !== null ? matchingProjects[i].glDistrict : "";
+							if( matchingProjects[i].gmDistrict !== null ) {
+								organHierarchy 	= 	organHierarchy + " &gt; "  + matchingProjects[i].gmDistrict;
+				          	}
+							if( matchingProjects[i].gsDistrict !== null ) {
+								organHierarchy 	= 	organHierarchy + " &gt; "  + matchingProjects[i].gsDistrict;
+				          	}							
+				        			  
+							suggestionItem.setAttribute('data-const-name', matchingProjects[i].constName);
+							suggestionItem.setAttribute('data-cid', matchingProjects[i].cid);
+					          suggestionItem.innerHTML = 
+					        	  '<span>' + matchingProjects[i].constName + '</span><br />\n' +
+					        	  '<span class="organizational-structure" data->' +
+					        	  "발주처: " + organHierarchy
+					        	  '</span>';
+					        	  
+					          suggestionItem.onclick = function() {
+					            projectNameInput.value = this.getAttribute('data-const-name');
+					            document.getElementById("TEMP_CONSTRUCT_SITE_INFO-CID").value = this.getAttribute('data-cid');
+					            suggestionListDiv.style.display = "none";					            
+					          };
+					          
+					          suggestionListDiv.appendChild(suggestionItem);
+					        }
+					        // suggestionListDiv 위치 설정
+					        var rect = projectNameInput.getBoundingClientRect();
+					        suggestionListDiv.style.position = 'absolute';
+					        //suggestionListDiv.style.left = rect.left + 'px';
+					        //suggestionListDiv.style.top = (rect.bottom + window.scrollY) + 'px';
+					        //suggestionListDiv.style.float = 'left';
+					        suggestionListDiv.style.width = rect.width + 'px';
+					        suggestionListDiv.style.display = "block";
+					      }
+						        
+					},
+					 error: function(xhr, option, error){
+					      alert(xhr.status); //오류코드
+					      alert(error); //오류내용
+					}
+				});
+		      
+		    }
+		    
+			
+	 	};
+	
+	
+	
+	  // 사용자가 추천 목록 외부를 클릭하면 목록 숨기기 (선택적)
+	  document.onclick = function(event) {
+	    if (event.target !== projectNameInput && event.target !== suggestionListDiv && !suggestionListDiv.contains(event.target)) {
+	      suggestionListDiv.style.display = "none";
+	    }
+	  };
 
 };
 
@@ -451,6 +573,8 @@ function fn_help_tour(){
 							<form name="frmMeta" id="frmMeta" action="/insertMeta.do" method="post">
 								<input type="hidden" id="REPORT_TYPE" name="REPORT_TYPE" value="CH" />
 								<input type="hidden" id="PROJECT_CODE" name="PROJECT_CODE" value="${mapMetaInfo.PROJECT_CODE }" />
+								<input type="hidden" id="TEMP_CONSTRUCT_SITE_INFO-CID" name="TEMP_CONSTRUCT_SITE_INFO-CID" />
+								
 
 								<table class="table table-bordered">
 									<colgroup>
@@ -496,7 +620,10 @@ function fn_help_tour(){
 										</tr>
 										<tr>
 											<th class="td-head">사업명</th>
-											<td colspan="3"><input id="PROJECT_NAME" name="PROJECT_NAME" maxlength="2000" type="text" value="${mapMetaInfo.PROJECT_NAME}" valid="notnull" validNm="사업명" /></td>
+											<td colspan="3">
+												<input id="PROJECT_NAME" name="PROJECT_NAME" maxlength="2000" type="text" value="${mapMetaInfo.PROJECT_NAME}" valid="notnull" validNm="사업명" />
+												<div id="suggestionList"></div>
+											</td>
 										</tr>
 										<tr>
 											<th class="td-head">총 시추공수</th>

src/main/webapp/WEB-INF/views/web/input/projectInfo.jsp

@@ -633,6 +633,28 @@
 			fn_SelectedData(masFrm02, project.projectMasterCompanyTwCode, 'GL_DISGM_DIS', 'multi', 'GDis', masFrm03, project.projectMasterCompanyThCode, 'GS_DIS', '3');
 			fn_SelectedData(masFrm03, project.projectMasterCompanyThCode, 'GL_DISGM_DISGF_DIS', 'multi', 'GDis', masFrm04, project.projectMasterCompanyFCode, 'GF_DIS', '4');
 		}
+		
+		//발주기관에 의해 입력된 발주처 정보 자동완성
+		var tempConstructSiteInfoString = '${result.tempConstructSiteInfo}';
+		if( tempConstructSiteInfoString ) {
+			var tempConstructSiteInfo = JSON.parse(tempConstructSiteInfoString);
+			if(tempConstructSiteInfo) {
+
+				var masFrm01 = document.getElementById("PROJECT_MASTER_COMPANY_O_CODE");
+				var masFrm02 = document.getElementById("PROJECT_MASTER_COMPANY_TW_CODE");
+				var masFrm03 = document.getElementById("PROJECT_MASTER_COMPANY_TH_CODE");
+				var masFrm04 = document.getElementById("PROJECT_MASTER_COMPANY_F_CODE");
+				
+				masFrm01.value = tempConstructSiteInfo.masterCompanyOCode;
+				fn_SelectedData(masFrm01, tempConstructSiteInfo.masterCompanyOCode, 'GL_DIS', 'multi', 'GDis', masFrm02, tempConstructSiteInfo.masterCompanyTwCode, 'GM_DIS');
+				masFrm02.value = tempConstructSiteInfo.masterCompanyTwCode;
+				fn_SelectedData(masFrm02, tempConstructSiteInfo.masterCompanyTwCode, 'GL_DISGM_DIS', 'multi', 'GDis', masFrm03, tempConstructSiteInfo.masterCompanyTwCode, 'GS_DIS', '3');
+				masFrm03.value = tempConstructSiteInfo.masterCompanyThCode;
+				fn_SelectedData(masFrm03, tempConstructSiteInfo.masterCompanyThCode, 'GL_DISGM_DISGF_DIS', 'multi', 'GDis', masFrm04, null, 'GF_DIS', '4');
+			}
+		}
+		
+		
 
 		if (document.getElementById("PROJECT_MASTER_COMPANY_O_CODE").selectedIndex == 0) {
 			document.getElementById("PROJECT_MASTER_COMPANY_NAME").disabled = true; //신규등록 발주처 선택시 입력창 비활성화
@@ -947,15 +969,15 @@
 										<tr>
 											<th class="td-head" rowspan="2">발주처</th>
 											<td colspan="5">
-												<select name="PROJECT_MASTER_COMPANY_O_CODE" id="PROJECT_MASTER_COMPANY_O_CODE" style="width: 160px;" class="selectbox" onChange="fn_onSelChangeGDis('GL_DIS','GM_DIS',this, document.frmProject.PROJECT_MASTER_COMPANY_TW_CODE,'2');fn_onSelChangeGDisInit(1);">
+												<select name="PROJECT_MASTER_COMPANY_O_CODE" id="PROJECT_MASTER_COMPANY_O_CODE" style="width: 160px;" class="selectbox" onChange="fn_onSelChangeGDis('GL_DIS','GM_DIS',this, document.frmProject.PROJECT_MASTER_COMPANY_TW_CODE,'2');fn_onSelChangeGDisInit(1);" >
 													<c:forEach var="item" items="${result.gDis}">
 														<c:if test="${item.code == 'GL_DIS'}">
 															<option value="${item.codeValue}">${item.codeText}</option>
 														</c:if>
 													</c:forEach>
 												</select>
-												<select name="PROJECT_MASTER_COMPANY_TW_CODE" id="PROJECT_MASTER_COMPANY_TW_CODE" style="width: 160px;" onChange="fn_onSelChangeGDis('GL_DISGM_DIS','GS_DIS',this, document.frmProject.PROJECT_MASTER_COMPANY_TH_CODE,'3');fn_onSelChangeGDisInit(2);" class="selectbox"></select>
-												<select name="PROJECT_MASTER_COMPANY_TH_CODE" id="PROJECT_MASTER_COMPANY_TH_CODE" style="width: 160px;" onChange="fn_onSelChangeGDis('GL_DISGM_DISGF_DIS','GF_DIS',this, document.frmProject.PROJECT_MASTER_COMPANY_F_CODE,'4')" class="selectbox"></select>
+												<select name="PROJECT_MASTER_COMPANY_TW_CODE" id="PROJECT_MASTER_COMPANY_TW_CODE" style="width: 160px;" onChange="fn_onSelChangeGDis('GL_DISGM_DIS','GS_DIS',this, document.frmProject.PROJECT_MASTER_COMPANY_TH_CODE,'3');fn_onSelChangeGDisInit(2);" class="selectbox" ></select>
+												<select name="PROJECT_MASTER_COMPANY_TH_CODE" id="PROJECT_MASTER_COMPANY_TH_CODE" style="width: 160px;" onChange="fn_onSelChangeGDis('GL_DISGM_DISGF_DIS','GF_DIS',this, document.frmProject.PROJECT_MASTER_COMPANY_F_CODE,'4')" class="selectbox" ></select>
 												<select name="PROJECT_MASTER_COMPANY_F_CODE" id="PROJECT_MASTER_COMPANY_F_CODE" style="width: 160px;" class="selectbox"></select>
 											</td>
 										</tr>

src/main/webapp/WEB-INF/views/web/manage/list_reg.jsp

@@ -193,7 +193,7 @@ function kendoGrid(dataList) {
 			},
 			{ field: "holeCnt", width: 100, title: "시추공수", template: "<div class='td-data'>#: holeCnt #</div>" },
 			{ field: "userName", width: 80, title: "공급자", template: "<div class='td-data'>#: userName #</div>" },
-			{ field: "datetime", width: 160, title: "입력일시",
+			{ field: "datetime", width: 160, title: "입력일시__",
 				template:  function(data){
 					var url = "<div class='td-data'>" + unixTimestampToFormattedDateTime(data.datetime.time) + "</div>";
 					return url;

src/main/webapp/WEB-INF/views/web/manage/modeify_call_reason.jsp

@@ -27,12 +27,8 @@ function resize(){
 }
 
 function fn_submit(){
-
 	// SMS전송팝업
 	fn_smsOpenPop();
-
-
-
 }
 
 //SMS팝업
@@ -51,8 +47,6 @@ function fn_smsOpenPop() {
 
 	smsWindow.focus();
 
-
-
 }
 
 // SMS전송결과 CALLBACK

src/main/webapp/WEB-INF/views/web/project/checklist.jsp

@@ -31,10 +31,10 @@ function fn_onsubmit(report_type, project_code, mode){
 			window.location.replace("checkListDb.do?REPORT_TYPE="+report_type+"&PROJECT_CODE="+project_code+"&MODE="+mode);
 		}
 	}
-
-
 }
 
+
+
 //바로가기
 function fn_checkGoPage(p_code, hole_code, id){
 

src/main/webapp/com/js/drilling/drilling-common.js

@@ -23,11 +23,12 @@ function onClickBtnViewOnMap() {
     const gs = document.getElementById('gs-district').value;
     const gf = document.getElementById('gf-district').value;
     const lastTeamName = document.getElementById('last-team-name').value;
+    const masterCompanyCode = document.getElementById('master-company-code').value;
 	
-	openMap('${sessionScope.USERID}','${cls}', gl, gm, gs, gf, lastTeamName, projectMasterCompanyName, maxX-minX, maxY-minY);
+	openMap('${sessionScope.USERID}','${cls}', gl, gm, gs, gf, lastTeamName, projectMasterCompanyName, maxX-minX, maxY-minY, masterCompanyCode);
 }
 
-function openMap(userid,cls, gl = null, gm = null, gs = null, gf = null, lastTeamName = null, projectMasterCompanyName = null, positionX= null, positionY= null)
+function openMap(userid,cls, gl = null, gm = null, gs = null, gf = null, lastTeamName = null, projectMasterCompanyName = null, positionX= null, positionY= null, masterCompanyCode=null)
 {
 	win = 'map';
 	sizeX=window.screen.width;
@@ -41,7 +42,7 @@ function openMap(userid,cls, gl = null, gm = null, gs = null, gf = null, lastTea
     		userArea = "부산광역시";
     	}			
 	}
-	var mapWin = window.open("/map/mapMain.do?userArea=" + encodeURIComponent(userArea) + "&gl=" + gl + "&gm=" + gm + "&gs=" + gs + "&gf=" + gf + "&lastTeamName=" + lastTeamName + "&positionX=" + positionX + "&positionY=" + positionY + "#tab_1_1","mapWin","toolbar=no,location=no,directories=no,status=yes,menubar=no,scrollbars=yes,resizable=yes,width=" + sizeX + ",height=" + sizeY + ",left=0,top=0");
+	var mapWin = window.open("/map/mapMain.do?userArea=" + encodeURIComponent(userArea) + "&gl=" + gl + "&gm=" + gm + "&gs=" + gs + "&gf=" + gf + "&lastTeamName=" + lastTeamName + "&masterCompanyCode=" + masterCompanyCode + "&positionX=" + positionX + "&positionY=" + positionY + "#tab_1_1","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();
 }
 

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){
-	top.location.href="topMenuSelect.do?url=" + url;
-	/*
-	 * if(url == "intro"){
-	 * top.location.href="https://geoinfo.or.kr/home/intro.jsp"; }else
-	 * if(url == "info"){
-	 * 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"; }
-	 */
+function gourl(url, src){
+	var topLocationHref="topMenuSelect.do?url=" + url;
+	if( src ) {
+		topLocationHref += "&" + "src=" + src;
+	}
+	top.location.href = topLocationHref;
 
 }
 /*

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 관리 변수
 // ================================================================
@@ -121,6 +148,8 @@ var HOLE_AREA;		// 영역 선택
 var HOLE_DRAW;		// 그리기 도구
 var HOLE_TOOLTIP;	// 툴팁
 
+var HOLE_DRILLING;		// 발주기관 시추공
+
 // ------------------------
 // 관정 관련
 // ------------------------
@@ -344,7 +373,7 @@ function initApp(param){
 		}, {
 			singleTile : false,
 			isBaseLayer : false,
-			visibility: true,
+			visibility: getQueryString("masterCompanyCode") === null ? true : true,
 			transitionEffect: "resize",
 			buffer : 0,
 			removeBackBufferDelay : 0
@@ -545,10 +574,37 @@ function initApp(param){
 	BASE_MAP.addControl(CTL_MEASURE2.PATH);
 	BASE_MAP.addControl(CTL_MEASURE.AREA);
 	BASE_MAP.addControl(CTL_MEASURE5.PATH);
+	
+	HOLE_DRILLING = new OpenLayers.Layer.Vector("DRILLING");
+	// 새로운 스타일 객체 생성
+    var holeImageStyle = new OpenLayers.Style(
+      {
+        fontFamily : "맑은 고딕"
+      },
+      {
+        rules: [
+          new OpenLayers.Rule({
+            symbolizer: {
+              externalGraphic : "/images/map/drilling-pin-35-50.png",
+              graphicWidth  : 35,
+              graphicHeight  : 50,
+              graphicXOffset : -18,
+              graphicYOffset : -55
+            }
+          })
+        ]
+      }
+	);
+    //스타일 적용
+    HOLE_DRILLING.styleMap = new OpenLayers.StyleMap(holeImageStyle);    
+	BASE_MAP.addLayer(HOLE_DRILLING);
+	
+	
 	// 객체 선택
 	HOLE_SELECT = new OpenLayers.Layer.Vector("SELECT");
 	HOLE_SELECT.styleMap = new OpenLayers.StyleMap(getStyleSELECT());
 	BASE_MAP.addLayer(HOLE_SELECT);
+	
 
 
 	CTL_SELECT = new OpenLayers.Control.WMSGetFeatureInfo({
@@ -556,7 +612,7 @@ function initApp(param){
 				    	crs: "EPSG:3857",
 				    	infoFormat: "application/json",
 				        //layers: [HOLE_LAYER,HOLE_LAYER_M],
-				    	layers: [HOLE_LAYER],
+				    	layers: [HOLE_LAYER,HOLE_DRILLING],
 				        queryVisible: true,
 				        maxFeatures: 1
 				   });
@@ -848,12 +904,13 @@ function initApp(param){
 		}
 	});
 
-	const userArea 		= getQueryString("userArea");
-	const gl 			= getQueryString("gl");
-	const gm 			= getQueryString("gm");
-	const gs 			= getQueryString("gs");
-	const gf 			= getQueryString("gf");
-	const lastTeamName 	= getQueryString("lastTeamName");
+	const userArea 			= getQueryString("userArea");
+	const gl 				= getQueryString("gl");
+	const gm 				= getQueryString("gm");
+	const gs 				= getQueryString("gs");
+	const gf 				= getQueryString("gf");
+	const lastTeamName 		= getQueryString("lastTeamName");
+	const masterCompanyCode = getQueryString("masterCompanyCode");
 				
 	const positionX = Number(getQueryString("positionX"));
 	const positionY = Number(getQueryString("positionY"));
@@ -906,61 +963,14 @@ 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();
 		}
 		
 		
@@ -1555,7 +1565,7 @@ function addProjectHoles(projectCode) {
 				var feature = format.read(row.wkt);
 				feature.attributes.CODE = row.code;
 				feature.geometry.transform('EPSG:5186', 'EPSG:3857');
-				features.push(feature);
+				features.push(feature);				
 			}
 
 			if(features.length > 0) {
@@ -1565,6 +1575,64 @@ function addProjectHoles(projectCode) {
 	});
 }
 
+function addDrillingHoles(companyCode) {
+	HOLE_DRILLING.removeAllFeatures();
+	HOLE_SELECT.removeAllFeatures();
+	HOLE_SELECT2.removeAllFeatures();
+	var bbox = {
+			minx: Infinity,
+			miny: Infinity,
+			maxx: -Infinity,
+			maxy: -Infinity
+		};
+	console.log("addProjectHoles projectCode ::: " + companyCode);
+	$.get("/drilling/map/search-hole-with-mbr.do", { companyCode : companyCode }).done(function(response) {
+		if(response && response.data) {
+			var format = new OpenLayers.Format.WKT();
+			var features = [];
+			
+			var isResultBaseMbr = true;
+			for(var i=0, len=response.data.length; i < len; i++) {
+				var row = response.data[i];
+				var feature = format.read(row.wkt);
+				feature.attributes.CODE = row.code;
+				
+				// 검색 결과를 기반으로 MBR 설정
+				if( isResultBaseMbr ) {
+					//feature.geometry.x의 최솟값 구한다.
+					bbox.minx = Math.min(bbox.minx, feature.geometry.x);
+					//feature.geometry.x의 최댓값 구한다.
+					bbox.maxx = Math.max(bbox.maxx, feature.geometry.x);
+					//feature.geometry.y의 최솟값 구한다.
+					bbox.miny = Math.min(bbox.miny, feature.geometry.y);
+					//feature.geometry.y의 최댓값 구한다.
+					bbox.maxy = Math.max(bbox.maxy, feature.geometry.y);					
+				} else {
+					// 계정에 영역에 맞는  MBR 설정
+					bbox.minx = response.mbr.v_min_x;
+					bbox.maxx = response.mbr.v_max_x;
+					bbox.miny = response.mbr.v_min_y;
+					bbox.maxy = response.mbr.v_max_y;					
+				}
+				
+
+				feature.geometry.transform('EPSG:5186', 'EPSG:3857');
+				features.push(feature);
+			}	
+			
+			if(features.length > 0) {
+				if( isResultBaseMbr ) {
+					moveToExtent(bbox.minx, bbox.miny, bbox.maxx, bbox.maxy);
+				} else {
+					BASE_MAP.zoomToExtent(new OpenLayers.Bounds(bbox.minx, bbox.miny, bbox.maxx, bbox.maxy).transform('EPSG:5186', 'EPSG:3857'), true);
+				}
+				HOLE_DRILLING.addFeatures(features);
+			}
+		}
+	});
+}
+
+
 
 function getStyleSELECT(){
 
@@ -1930,8 +1998,7 @@ function changeProject(pName){
 
 
 function getLegend(){
-
-	if (HOLE_LAYER.legend == null
+	if ( HOLE_LAYER.legend == null
 			|| HOLE_LAYER.legend == "undefined"){
 		return "YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY";
 	}
@@ -2046,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;
@@ -3059,6 +3125,11 @@ var jibanLocArr = [];
 var jibanInfoArr = [];
 
 function ajaxGetJibanList(){
+	
+	if( getQueryString("masterCompanyCode") !== null ) {
+		return false;
+	}
+	
 	$.get("/map/ajaxGetJibanInfoList.do").done(function(data) {
 		if(data) {
 			for(var i = 0; i < data.result.length; i ++){

src/main/webapp/kendo-ui/js/common.js

@@ -513,7 +513,9 @@ function fn_saveNumberCheckKendo(type, gridRoot, dataGrid, grid, startIndex, ite
 							var columnDataVector = gridDataArray[r][columnName];
 							var val = columnDataVector;
 
-							if(fn_isNull(val) != "" && (is_float(val,Number(item[i+"_start_num"]),Number(item[i+"_end_num"])) == false || is_numberRange(val,Number(item[i+"_start_num"]),Number(item[i+"_end_num"])) == false )){
+							if(fn_isNull(val) != "" && val === "-") {
+								
+							} else if(fn_isNull(val) != "" && (is_float(val,Number(item[i+"_start_num"]),Number(item[i+"_end_num"])) == false || is_numberRange(val,Number(item[i+"_start_num"]),Number(item[i+"_end_num"])) == false )){
 								alert(title + "값의 범위를 확인하시기 바랍니다. ([2]정수 : "+item[i+"_start_num"]+"자리, 소수점 이하 : "+ item[i+"_end_num"]+"자리)");
 								fn_progressbarHide();		//ProgressbarHide
 								setEditedItemPositionKendoFrom(i, r , grid, dataGrid);

src/main/webapp/proxyo2map.jsp

@@ -12,7 +12,7 @@
 		// 한글인코딩
 		request.setCharacterEncoding("UTF-8");
 
-		final String O2MAP_WMS_URL 	= EgovProperties.getProperty("O2MAP.wms.url").trim();
+		final String O2MAP_WMS_URL 	= EgovProperties.getProperty("O2MAP.wms.url") == null ? null : EgovProperties.getProperty("O2MAP.wms.url").trim();
 		
 		// post, get에서 쓸 url
 		String reqUrl = "http://218.232.234.166/o2map/services/wms";