diff --git a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java index df79d89..f698312 100644 --- a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java +++ b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java @@ -601,10 +601,15 @@ public class ConstructionProjectManagementController { @RequestMapping(value = "admins/constructionProjectManagement/construction-site-index.do") public String constructionSiteIndex(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + JSONObject jsonObj = new JSONObject(); if (!UserInfo.isValidSession(request, response, "admin")) { return ""; } + List gDis = drillingInquiryService.getGDisList(params); + jsonObj.put("gDis", gDis); + + model.put("result", jsonObj); model.addAttribute("params", params); return "admins/constructionProjectManagement/construction-site-index"; } diff --git a/src/main/java/geoinfo/admins/user/service/DrillingInquiryMapper.java b/src/main/java/geoinfo/admins/user/service/DrillingInquiryMapper.java index 1593a40..b77841b 100644 --- a/src/main/java/geoinfo/admins/user/service/DrillingInquiryMapper.java +++ b/src/main/java/geoinfo/admins/user/service/DrillingInquiryMapper.java @@ -16,6 +16,8 @@ public interface DrillingInquiryMapper { public List spGetTblCsiByKeyword(HashMap params) throws SQLException; public String getComCodes(HashMap params) throws SQLException; public String spGetConstCompanyName(Long constCompanyCode) throws SQLException; + + List getGDisList(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/admins/user/service/DrillingInquiryService.java b/src/main/java/geoinfo/admins/user/service/DrillingInquiryService.java index 0adff82..37445f4 100644 --- a/src/main/java/geoinfo/admins/user/service/DrillingInquiryService.java +++ b/src/main/java/geoinfo/admins/user/service/DrillingInquiryService.java @@ -16,4 +16,5 @@ public interface DrillingInquiryService { public JSONObject drillingInquiryList(HttpServletRequest request, HashMap params) throws Exception; + public List getGDisList(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/admins/user/service/impl/DrillingInquiryServiceImpl.java b/src/main/java/geoinfo/admins/user/service/impl/DrillingInquiryServiceImpl.java index 728fd01..9f1f48c 100644 --- a/src/main/java/geoinfo/admins/user/service/impl/DrillingInquiryServiceImpl.java +++ b/src/main/java/geoinfo/admins/user/service/impl/DrillingInquiryServiceImpl.java @@ -120,10 +120,10 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { String userId = MyUtil.getStringFromObject( params.get("userId") ); String excelDownload = MyUtil.getStringFromObject( params.get("excelDownload") ); - String masterCompanyOCode = ""; - String masterCompanyTwCode = ""; - String masterCompanyThCode = ""; - String masterCompanyName = ""; + String masterCompanyOCode = MyUtil.getStringFromObject( params.get("projectMasterCompanyOCode") ); + String masterCompanyTwCode = MyUtil.getStringFromObject( params.get("projectMasterCompanyTwCode") ); + String masterCompanyThCode = MyUtil.getStringFromObject( params.get("projectMasterCompanyThCode") ); + String masterCompanyName = MyUtil.getStringFromObject( params.get("projectMasterCompanyFCode") ); String sortfield = "C".equals(MyUtil.getStringFromObject(params.get("constTag"))) ? "0" : "2"; String sorttype = "2"; @@ -296,4 +296,9 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { throw new Exception( e.getMessage() ); } } + @Override + + public List getGDisList(HashMap params) throws Exception { + return drillingInquiryMapper.getGDisList(params); + } } 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 549ae7f..edf8cde 100644 --- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml +++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml @@ -171,4 +171,56 @@ SELECT SP_GET_CONST_COMPANY_NAME(#{constCompanyCode}) FROM DUAL + \ No newline at end of file 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 efd4ef9..e71fb99 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 @@ -11,10 +11,266 @@