From a310e657b251a5c7ff615121948c969ce35890ce Mon Sep 17 00:00:00 2001
From: thkim <thkim@dbnt.co.kr>
Date: Mon, 24 Nov 2025 13:24:20 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B1=B4=EC=84=A4=ED=98=84=EC=9E=A5?=
 =?UTF-8?q?=EC=A1=B0=ED=99=94=20=EC=9E=85=EB=A0=A5=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=EC=A4=91=20=EA=B2=80=EC=88=98=EB=8C=80=EA=B8=B0=EB=A5=BC=20?=
 =?UTF-8?q?=EA=B2=80=EC=88=98=20=EC=A4=80=EB=B9=84=20=EB=8C=80=EA=B8=B0?=
 =?UTF-8?q?=EC=A4=91=EC=9C=BC=EB=A1=9C=20=EB=AC=B8=EA=B5=AC=20=ED=86=B5?=
 =?UTF-8?q?=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inquiry/DrillingInquiryMapper.xml         |  4 +-
 .../views/drilling/common/includeTopMenu.jsp  | 55 +++++++++----------
 .../drilling/inquiry/drilling_inquiry.jsp     | 32 ++++++++---
 .../statistics/drilling_statistics.jsp        |  2 +-
 4 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml b/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml
index d5c5cc7f..9760ba13 100644
--- a/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml
+++ b/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml
@@ -19,7 +19,7 @@
 			#{constComCodes, jdbcType=VARCHAR},
 			#{constCompanyAdmin, jdbcType=VARCHAR},
 			#{constCompanyTel, jdbcType=VARCHAR},
-			NULL
+			#{projectStateCode, jdbcType=VARCHAR}			
 		) FROM DUAL
 	</select>
 	
@@ -38,7 +38,7 @@
 			#{constComCodes, jdbcType=VARCHAR},
 			#{constCompanyAdmin, jdbcType=VARCHAR},
 			#{constCompanyTel, jdbcType=VARCHAR},
-			NULL,
+			#{projectStateCode, jdbcType=VARCHAR},
 			#{sortfield},
 			#{sorttype},
 			#{nCount},
diff --git a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp
index 0ce720ef..2eee447e 100644
--- a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp
+++ b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp
@@ -31,7 +31,7 @@
                  <!-- 국토지반정보 통합DB센터 logo -->
                  <div id="wrap_global">
                      <ul id="util">
-                         <li><a href="/"><img src="/com/img/drilling/logos/geoinfo-logo.png" class="geoinfo-logo" alt="국토지반정보시스템 메인으로 이동" /></a></li>
+                         <li><a href="/drilling/index.do"><img src="/com/img/drilling/logos/geoinfo-logo.png" class="geoinfo-logo" alt="국토지반정보시스템 메인으로 이동" /></a></li>
                      </ul>
                  </div>
                  <!-- //국토지반정보 통합DB센터 logo -->
@@ -52,99 +52,98 @@
 		
                 <!-- 지방청 logo -->
                 <c:if test="${'025' == masterCompanyCode}">                
-                	<h1 class="logo logo-05"><a href="/drilling/index.do">대전지방국토관리청</a></h1>
+                	<h1 class="logo logo-05"><a href="/topMenuSelect.do?url=mypage_main">대전지방국토관리청</a></h1>
                 </c:if>
                 <c:if test="${ '001' == masterCompanyCode || '610' == masterCompanyCode || '709' == masterCompanyCode || '740' == masterCompanyCode || '9565' == masterCompanyCode || '-000' == masterCompanyCode || '-000' == masterCompanyCode}">
-                	<h1 class="logo logo-03"><a href="/drilling/index.do">부산지방국토관리청</a></h1>
+                	<h1 class="logo logo-03"><a href="/topMenuSelect.do?url=mypage_main">부산지방국토관리청</a></h1>
                 </c:if>               
 
             <!-- 국토교통부 산하기관 -->       
                 <c:if test="${'362' == masterCompanyCode}">                
-                	<h1 class="logo logo-06"><a href="/drilling/index.do">한국토지주택공사</a></h1>
+                	<h1 class="logo logo-06"><a href="/topMenuSelect.do?url=mypage_main">한국토지주택공사</a></h1>
                 </c:if>
                 <c:if test="${'031' == masterCompanyCode}">                
-                	<h1 class="logo logo-07"><a href="/drilling/index.do">한국도로공사</a></h1>
+                	<h1 class="logo logo-07"><a href="/topMenuSelect.do?url=mypage_main">한국도로공사</a></h1>
                 </c:if>
                    <c:if test="${'9402' == masterCompanyCode}">                
-                	<h1 class="logo logo-08"><a href="/drilling/index.do">국가철도공단</a></h1>
+                	<h1 class="logo logo-08"><a href="/topMenuSelect.do?url=mypage_main">국가철도공단</a></h1>
                 </c:if>
                  <c:if test="${'305' == masterCompanyCode}">                
-                	<h1 class="logo logo-09"><a href="/drilling/index.do">한국공항공사</a></h1>
-                </c:if>
-                 <c:if test="${'903' == masterCompanyCode}">                
-                	<h1 class="logo logo-10"><a href="/drilling/index.do">한국철도공사</a></h1>
+                	<h1 class="logo logo-09"><a href="/topMenuSelect.do?url=mypage_main">한국공항공사</a></h1>
+                </c:if>                 <c:if test="${'903' == masterCompanyCode}">                
+                	<h1 class="logo logo-10"><a href="/topMenuSelect.do?url=mypage_main">한국철도공사</a></h1>
                 </c:if>
 
             <!-- 환경부 소속기관 -->    
                 <c:if test="${'9515' == masterCompanyCode}">                
-                	<h1 class="logo logo-17"><a href="/drilling/index.do">한강유역환경청</a></h1>
+                	<h1 class="logo logo-17"><a href="/topMenuSelect.do?url=mypage_main">한강유역환경청</a></h1>
                 </c:if>
 
             <!-- 환경부 산하기관 -->
                 <c:if test="${'134' == masterCompanyCode}">                
-                	<h1 class="logo logo-28"><a href="/drilling/index.do">한국수자원공사</a></h1>
+                	<h1 class="logo logo-28"><a href="/topMenuSelect.do?url=mypage_main">한국수자원공사</a></h1>
                 </c:if>
 
             <!-- 해양수산부 소속기관 -->
                 <c:if test="${'108' == masterCompanyCode}">                
-                    <h1 class="logo logo-29"><a href="/drilling/index.do">부산지방해양수산청</a></h1>
+                    <h1 class="logo logo-29"><a href="/topMenuSelect.do?url=mypage_main">부산지방해양수산청</a></h1>
                 </c:if>
 
                 <c:if test="${'411' == masterCompanyCode}">                
-                    <h1 class="logo logo-31"><a href="/drilling/index.do">인천지방해양수산청 </a></h1>
+                    <h1 class="logo logo-31"><a href="/topMenuSelect.do?url=mypage_main">인천지방해양수산청 </a></h1>
                 </c:if>
 
                 <c:if test="${'399' == masterCompanyCode}">                
-                    <h1 class="logo logo-33"><a href="/drilling/index.do">여수지방해양수산청</a></h1>
+                    <h1 class="logo logo-33"><a href="/topMenuSelect.do?url=mypage_main">여수지방해양수산청</a></h1>
                 </c:if>
 
                 <c:if test="${'686' == masterCompanyCode}">                
-                    <h1 class="logo logo-34"><a href="/drilling/index.do">마산지방해양수산청</a></h1>
+                    <h1 class="logo logo-34"><a href="/topMenuSelect.do?url=mypage_main">마산지방해양수산청</a></h1>
                 </c:if>
 
                 <c:if test="${'586' == masterCompanyCode}">                
-                    <h1 class="logo logo-35"><a href="/drilling/index.do">울산지방해양수산청</a></h1>
+                    <h1 class="logo logo-35"><a href="/topMenuSelect.do?url=mypage_main">울산지방해양수산청</a></h1>
                 </c:if>
 
                 <c:if test="${'260' == masterCompanyCode}">                
-                    <h1 class="logo logo-36"><a href="/drilling/index.do">동해지방해양수산청</a></h1>
+                    <h1 class="logo logo-36"><a href="/topMenuSelect.do?url=mypage_main">동해지방해양수산청</a></h1>
                 </c:if>
 
                 <c:if test="${'585' == masterCompanyCode}">                
-                    <h1 class="logo logo-37"><a href="/drilling/index.do">군산지방해양수산청 </a></h1>
+                    <h1 class="logo logo-37"><a href="/topMenuSelect.do?url=mypage_main">군산지방해양수산청 </a></h1>
                 </c:if>
 
                 <c:if test="${'353' == masterCompanyCode}">                
-                    <h1 class="logo logo-38"><a href="/drilling/index.do">목포지방해양수산청</a></h1>
+                    <h1 class="logo logo-38"><a href="/topMenuSelect.do?url=mypage_main">목포지방해양수산청</a></h1>
                 </c:if>
 
                 <c:if test="${'256' == masterCompanyCode}">                
-                    <h1 class="logo logo-39"><a href="/drilling/index.do">포항지방해양수산청</a></h1>
+                    <h1 class="logo logo-39"><a href="/topMenuSelect.do?url=mypage_main">포항지방해양수산청</a></h1>
                 </c:if>
 
                 <c:if test="${'642' == masterCompanyCode}">                
-                    <h1 class="logo logo-40"><a href="/drilling/index.do">평택지방해양수산청</a></h1>
+                    <h1 class="logo logo-40"><a href="/topMenuSelect.do?url=mypage_main">평택지방해양수산청</a></h1>
                 </c:if>
 
                 <c:if test="${'556' == masterCompanyCode}">                
-                    <h1 class="logo logo-41"><a href="/drilling/index.do">대산지방해양수산청</a></h1>
+                    <h1 class="logo logo-41"><a href="/topMenuSelect.do?url=mypage_main">대산지방해양수산청</a></h1>
                 </c:if>
                 
             <!-- 해양수산부 산하기관 -->
                 <c:if test="${'349' == masterCompanyCode}">                
-                	<h1 class="logo logo-42"><a href="/drilling/index.do">부산항만공사</a></h1>
+                	<h1 class="logo logo-42"><a href="/topMenuSelect.do?url=mypage_main">부산항만공사</a></h1>
                 </c:if>
                 <c:if test="${'393' == masterCompanyCode}">                
-                	<h1 class="logo logo-43"><a href="/drilling/index.do">인천항만공사</a></h1>
+                	<h1 class="logo logo-43"><a href="/topMenuSelect.do?url=mypage_main">인천항만공사</a></h1>
                 </c:if>
                  <c:if test="${'1141' == masterCompanyCode}">                
-                	<h1 class="logo logo-44"><a href="/drilling/index.do">울산항만공사</a></h1>
+                	<h1 class="logo logo-44"><a href="/topMenuSelect.do?url=mypage_main">울산항만공사</a></h1>
                 </c:if>
                  <c:if test="${'1142' == masterCompanyCode}">                
-                	<h1 class="logo logo-45"><a href="/drilling/index.do">경기평택항만공사</a></h1>
+                	<h1 class="logo logo-45"><a href="/topMenuSelect.do?url=mypage_main">경기평택항만공사</a></h1>
                 </c:if>
                  <c:if test="${'1132' == masterCompanyCode}">                
-                	<h1 class="logo logo-46"><a href="/drilling/index.do">여수광양항만공사</a></h1>
+                	<h1 class="logo logo-46"><a href="/topMenuSelect.do?url=mypage_main">여수광양항만공사</a></h1>
                 </c:if>
             </div>
 
diff --git a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp
index abc7a03e..af888eb7 100644
--- a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp
+++ b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp
@@ -123,9 +123,14 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
   }
   
   #const-state-code {
+  	width: 180px;
+  }
+  
+  #project-state-code {
   	width: 160px;
   }
   
+  
 	
 </style>
 
@@ -147,6 +152,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
         
         
         const constStateCode    = trim( document.getElementById('const-state-code').value   );
+        const projectStateCode  = trim( document.getElementById('project-state-code').value );
         const constCompanyName  = trim( document.getElementById('company-dept').value       );
         const constCompanyAdmin = trim( document.getElementById('company-admin').value      );
         const constCompanyTel   = trim( document.getElementById('company-tel').value        );
@@ -161,6 +167,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
         '&' +'constStartDate='+ constStartDate +
         '&' +'constEndDate='+ constEndDate +
         '&' +'constStateCode='+ constStateCode +
+        '&' +'projectStateCode='+ projectStateCode +
         '&' +'constCompanyName='+ constCompanyName +
         '&' +'constCompanyAdmin='+ constCompanyAdmin +
         '&' +'constCompanyTel='+ constCompanyTel +
@@ -415,6 +422,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
 	    params.append("constStartDate", trim($('#const-start-date').val()));
 	    params.append("constEndDate", trim($('#const-end-date').val()));
 	    params.append("constStateCode", trim($('#const-state-code').val()));
+	    params.append("projectStateCode", trim($('#project-state-code').val()));
 	    params.append("constCompanyName", trim($('#company-dept').val()));
 	    params.append("constCompanyAdmin", trim($('#company-admin').val()));
 	    params.append("constCompanyTel", trim($('#company-tel').val()));
@@ -484,15 +492,25 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
                                 <input type="date" id="const-start-date" name="const-start-date" >
                                 <span>~</span>
                                 <input type="date" id="const-end-date" name="const-end-date" >
-                                <input type="hidden" >	
+                                <input type="hidden" >
                                 <select id="const-state-code" name="const-state-code">
 								    <option value="" selected="selected">전체</option>
-								    <option value="1">미입력</option>
-								    <option value="2">입력 중</option>
-								    <option value="3">검수 준비 대기중</option>
-								    <option value="4">검수 중</option>
-								    <option value="6">수정 요청</option>
-								    <option value="7">등록 완료</option>
+								    <option value="1">타당성조사 및 계획검토</option>
+								    <option value="2">기본설계</option>
+								    <option value="3">실시설계</option>
+								    <option value="4">시공 중</option>
+								    <option value="5">준공</option>
+								    <option value="6">유지보수</option>
+								</select>
+                                <select id="project-state-code" name="project-state-code">
+								    <option value="" selected="selected">전체</option>
+								    <option value="0">미입력</option>
+								    <option value="1">입력 중</option>
+								    <option value="2">검수 준비 대기중</option>
+								    <option value="3">검수 중</option>
+								    <option value="4">수정 요청</option>
+								    <option value="5">검수 완료</option>
+								    <option value="6">등록 완료</option>
 								</select>
                             </form>
                             <form class="form-inline-row">
diff --git a/src/main/webapp/WEB-INF/views/drilling/statistics/drilling_statistics.jsp b/src/main/webapp/WEB-INF/views/drilling/statistics/drilling_statistics.jsp
index c05838c2..8a1aed56 100644
--- a/src/main/webapp/WEB-INF/views/drilling/statistics/drilling_statistics.jsp
+++ b/src/main/webapp/WEB-INF/views/drilling/statistics/drilling_statistics.jsp
@@ -300,7 +300,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
                                                     '<th class="p-2 font-semibold text-gray-700 text-center">총 프로젝트</th>' +
                                                     '<th class="p-2 font-semibold text-gray-700 text-center">미입력</th>' +
                                                     '<th class="p-2 font-semibold text-gray-700 text-center">입력중</th>' +
-                                                    '<th class="p-2 font-semibold text-gray-700 text-center">검수대기</th>' +
+                                                    '<th class="p-2 font-semibold text-gray-700 text-center">검수 준비 대기중</th>' +
                                                     '<th class="p-2 font-semibold text-gray-700 text-center">검수중</th>' +
                                                     '<th class="p-2 font-semibold text-gray-700 text-center">수정 요청</th>' +
                                                     '<th class="p-2 font-semibold text-gray-700 text-center">검수 완료</th>' +