From 769e3633b544c81d123d02f88ea71d0befbfefb9 Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 24 Nov 2025 13:39:43 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B1=B4=EC=84=A4=ED=98=84=EC=9E=A5=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=97=90=EC=84=9C=20=EA=B1=B4=EC=84=A4?= =?UTF-8?q?=ED=98=84=EC=9E=A5=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EC=83=81=ED=83=9C=20=ED=95=84=ED=84=B0=EB=A7=81=20?= =?UTF-8?q?=EB=8F=99=EC=9E=91=20=EC=95=88=20=ED=95=98=EB=8A=94=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admins/user/DrillingInquiryMapper.xml | 4 +-- .../construction-site-index.jsp | 35 ++++++++++++++----- .../construction-user-detail.jsp | 26 ++++++++++---- 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml index fc5f496..70d085e 100644 --- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml +++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml @@ -79,7 +79,7 @@ #{constComCodes, jdbcType=VARCHAR}, #{constCompanyAdmin, jdbcType=VARCHAR}, #{constCompanyTel, jdbcType=VARCHAR}, - NULL + #{projectStateCode, jdbcType=VARCHAR} ) FROM DUAL @@ -98,7 +98,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/admins/constructionProjectManagement/construction-site-index.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-site-index.jsp index e7e212e..6ab82e0 100644 --- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-site-index.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-site-index.jsp @@ -29,6 +29,7 @@ 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 ); @@ -44,6 +45,7 @@ '&' +'constStartDate='+ constStartDate + '&' +'constEndDate='+ constEndDate + '&' +'constStateCode='+ constStateCode + + '&' +'projectStateCode='+ projectStateCode + '&' +'constCompanyName='+ constCompanyName + '&' +'constCompanyAdmin='+ constCompanyAdmin + '&' +'constCompanyTel='+ constCompanyTel + @@ -396,8 +398,15 @@ li { } #const-state-code { - width: 160px; + width: 180px; + height: 24px; } + + #project-state-code { + width: 160px; + height: 24px; + } + .drilling .page-content-inner{ padding: 0; } @@ -428,15 +437,25 @@ li { ~ - + +
diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-user-detail.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-user-detail.jsp index 21b942b..46bdbec 100644 --- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-user-detail.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-user-detail.jsp @@ -29,6 +29,7 @@ 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 ); @@ -44,6 +45,7 @@ '&' +'constStartDate='+ constStartDate + '&' +'constEndDate='+ constEndDate + '&' +'constStateCode='+ constStateCode + + '&' +'projectStateCode='+ projectStateCode + '&' +'constCompanyName='+ constCompanyName + '&' +'constCompanyAdmin='+ constCompanyAdmin + '&' +'constCompanyTel='+ constCompanyTel + @@ -504,15 +506,25 @@ li { ~ - + +