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
@@ -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 @@
- 
+ 
@@ -52,99 +52,98 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
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;
}
+
@@ -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
~
-
+
+