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 { ~ - + +