diff --git a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java index e30ade0..dd90f38 100644 --- a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java +++ b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java @@ -581,6 +581,26 @@ public class ConstructionProjectManagementController { return "admins/constructionProjectManagement/visit-training-approval-system"; } + /** + * 건설현장 조회 목록화면 + * @param params + * @param model + * @param response + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/constructionProjectManagement/construction-site-index.do") + public String constructionSiteIndex(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + + if (!UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + + model.addAttribute("params", params); + return "admins/constructionProjectManagement/construction-site-index"; + } + /** * 건설현장 관리 > 발주기관 계정 화면 * @param params @@ -652,6 +672,51 @@ public class ConstructionProjectManagementController { return "admins/constructionProjectManagement/construction-user-detail"; } + /** + * 프로젝트 목록 조회 프로젝트명 자동검색 + * @param request + * @param response + * @param params + * @return + * @throws Exception + */ + @ResponseBody + @RequestMapping(value = "/drilling-project-list", method = RequestMethod.GET, produces = "application/json; charset=UTF-8") + public String getDrillingProjectList(HttpServletRequest request, HttpServletResponse response, @RequestParam HashMap params) throws Exception { + if (!UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + JSONObject jsonObject = new JSONObject(); + strUtil sUtil = new strUtil(); + + String projectName = sUtil.checkNull((String)params.get("projectName")); + + JSONArray jsonListObject = new JSONArray(); + JSONObject result = new JSONObject(); + result.put("list", drillingInquiryService.drillingInquiryAutocompleteList(request, params)); + + jsonObject.put("resultMessage", "OK"); + jsonObject.put("resultCode", 200); + jsonObject.put("result", result); + + response.setContentType("application/json; charset=UTF-8"); // 응답 헤더 설정 + response.setCharacterEncoding("UTF-8"); // 응답 데이터 인코딩 설정 (중요) + + try (OutputStream os = response.getOutputStream()) { // OutputStream 사용 + os.write(jsonObject.toString().getBytes("UTF-8")); // UTF-8 인코딩하여 출력 + } + + return null; // @ResponseBody이므로 반환 값은 필요 없습니다. + } + + /** + * 발주기관 프로젝트목록 가져오기 + * @param request + * @param params + * @param response + * @return + * @throws IOException + */ @RequestMapping(value = "/drilling/inquiry/list.do", method = RequestMethod.GET, produces = { "application/json; charset=utf-8" }) @ResponseBody public ResponseEntity drillingInquiryList ( diff --git a/src/main/java/geoinfo/admins/user/service/DrillingInquiryMapper.java b/src/main/java/geoinfo/admins/user/service/DrillingInquiryMapper.java index 5fbbf95..1593a40 100644 --- a/src/main/java/geoinfo/admins/user/service/DrillingInquiryMapper.java +++ b/src/main/java/geoinfo/admins/user/service/DrillingInquiryMapper.java @@ -10,7 +10,7 @@ import egovframework.rte.psl.dataaccess.util.EgovMap; @Mapper("drillingInquiryMapper") public interface DrillingInquiryMapper { -// public List drillingInquiryAutocompleteList(HashMap params) throws SQLException; + public List drillingInquiryAutocompleteList(HashMap params) throws SQLException; public Long sPCntTblCsiByKeyword(HashMap params) throws SQLException; public List spGetTblCsiByKeyword(HashMap params) throws SQLException; diff --git a/src/main/java/geoinfo/admins/user/service/DrillingInquiryService.java b/src/main/java/geoinfo/admins/user/service/DrillingInquiryService.java index a4bfa6e..0adff82 100644 --- a/src/main/java/geoinfo/admins/user/service/DrillingInquiryService.java +++ b/src/main/java/geoinfo/admins/user/service/DrillingInquiryService.java @@ -12,7 +12,7 @@ import egovframework.rte.psl.dataaccess.util.EgovMap; public interface DrillingInquiryService { -// List drillingInquiryAutocompleteList(HttpServletRequest request, HashMap params) throws Exception; + List drillingInquiryAutocompleteList(HttpServletRequest request, HashMap params) throws Exception; public JSONObject drillingInquiryList(HttpServletRequest request, 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 ce07b84..0e93cbd 100644 --- a/src/main/java/geoinfo/admins/user/service/impl/DrillingInquiryServiceImpl.java +++ b/src/main/java/geoinfo/admins/user/service/impl/DrillingInquiryServiceImpl.java @@ -38,14 +38,14 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { @Autowired DrillingInputService drillingInputService; -// @Override -// public List drillingInquiryAutocompleteList(HttpServletRequest request, HashMap params) throws Exception { -// HashMap map = new HashMap(); -// String userid = (String)params.get("userid"); -// map.put("userId", userid); -// -// EgovMap result = userMapper.selectInfo(map); -// + @Override + public List drillingInquiryAutocompleteList(HttpServletRequest request, HashMap params) throws Exception { + HashMap map = new HashMap(); + String userid = (String)params.get("userid"); + map.put("userId", userid); + + EgovMap result = userMapper.selectInfo(map); + // int cls = MyUtil.getIntegerFromObject(result.get("cls")); // // if( cls == 2 ) { @@ -63,54 +63,54 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { // // } // -// -// -// -// try { -// try { -// List list = drillingInquiryMapper.drillingInquiryAutocompleteList(params); -// return list; -// } catch (SQLException e) { -// String strTxt = -// "---------- BUG REPORTING START ----------" + "\n" + -// "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + -// "params:[\n" + params.toString() + "\n]\n" + -// "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + -// "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + -// "---------- BUG REPORTING END ----------" + "\n" + -// ""; -// System.out.println(strTxt); -// throw new Exception( "오류가 발생하였습니다." + "\n" + "SQLException" ); -// } -// -// -// } catch (org.json.simple.parser.ParseException e) { -// // TODO Auto-generated catch block -// throw new Exception( e.getMessage() ); -// } -// } + + + + try { + try { + List list = drillingInquiryMapper.drillingInquiryAutocompleteList(params); + return list; + } catch (SQLException e) { + String strTxt = + "---------- BUG REPORTING START ----------" + "\n" + + "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + + "params:[\n" + params.toString() + "\n]\n" + + "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + + "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + + "---------- BUG REPORTING END ----------" + "\n" + + ""; + System.out.println(strTxt); + throw new Exception( "오류가 발생하였습니다." + "\n" + "SQLException" ); + } -// public HashMap getOrganizationUserGlGmGsGfCodes(String userId) throws Exception { -// -// String projectMasterCompanyName = userMapper.findProjectMasterCompanyNameByUserid(userId); -// -// if( projectMasterCompanyName == null ) { -// throw new Exception( "발주 기관 계정에 설정된 기관이 존재하지 않습니다" ); -// } -// -// HashMap spGetMasterCompanyDistrictParams = new HashMap(); -// -// //String[] words = projectMasterCompanyName.split(" "); -// //String lastWord = words[words.length - 1]; -// //spGetMasterCompanyDistrictParams.put("projectMasterCompanyName", lastWord); -// spGetMasterCompanyDistrictParams.put("projectMasterCompanyName", projectMasterCompanyName); -// -// -// drillingInputMapper.spGetMasterCompanyDistrict(spGetMasterCompanyDistrictParams); -// -// return spGetMasterCompanyDistrictParams; -// -// } + + } catch (org.json.simple.parser.ParseException e) { + // TODO Auto-generated catch block + throw new Exception( e.getMessage() ); + } + } + + public HashMap getOrganizationUserGlGmGsGfCodes(String userId) throws Exception { + + String projectMasterCompanyName = userMapper.findProjectMasterCompanyNameByUserid(userId); + + if( projectMasterCompanyName == null ) { + throw new Exception( "발주 기관 계정에 설정된 기관이 존재하지 않습니다" ); + } + + HashMap spGetMasterCompanyDistrictParams = new HashMap(); + + //String[] words = projectMasterCompanyName.split(" "); + //String lastWord = words[words.length - 1]; + //spGetMasterCompanyDistrictParams.put("projectMasterCompanyName", lastWord); + spGetMasterCompanyDistrictParams.put("projectMasterCompanyName", projectMasterCompanyName); + + + drillingInputMapper.spGetMasterCompanyDistrict(spGetMasterCompanyDistrictParams); + + return spGetMasterCompanyDistrictParams; + + } @Override public JSONObject drillingInquiryList(HttpServletRequest request, HashMap params) throws Exception { @@ -118,20 +118,20 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { JSONObject jsonResponse = new JSONObject(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String userId = MyUtil.getStringFromObject( params.get("userId") ); - -// if( userId == null){ -// throw new Exception( "로그인이 필요한 서비스입니다." ); -// } - - - HashMap spGetMasterCompanyDistrictParams = drillingInputService.getOrganizationUserGlGmGsGfCodes(userId); - - String masterCompanyOCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gl") ); - String masterCompanyTwCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gm") ); - String masterCompanyThCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gs") ); - String masterCompanyName = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gf") ); + String masterCompanyOCode = ""; + String masterCompanyTwCode = ""; + String masterCompanyThCode = ""; + String masterCompanyName = ""; String sortfield = "C".equals(MyUtil.getStringFromObject(params.get("constTag"))) ? "0" : "2"; String sorttype = "2"; + + if( userId != null){ + HashMap spGetMasterCompanyDistrictParams = drillingInputService.getOrganizationUserGlGmGsGfCodes(userId); + masterCompanyOCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gl") ); + masterCompanyTwCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gm") ); + masterCompanyThCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gs") ); + masterCompanyName = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gf") ); + } params.put("masterCompanyOCode", masterCompanyOCode); params.put("masterCompanyTwCode", masterCompanyTwCode); params.put("masterCompanyThCode", masterCompanyThCode); 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 234c318..fc5f496 100644 --- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml +++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml @@ -4,65 +4,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+ +
+ +
+
+ + +
+
+
+
+ + + +
+ + ~ + + + +
+
+ + + + +<%-- --%> +
+
+
Total: -건
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
연번사업명입력상태사업내용발주기관현황건설사현황
사업기간사업단계
(설계 시공 준공 유지관리)		담당부서담당자담당연락처건설사명담당자담당연락처
+
+
+
+
+
+ +
+
+ +
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp index bdd6582..26b4bd9 100644 --- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp @@ -77,6 +77,9 @@ img { border:0; }
 건설현장 통계
+
+  건설현장 조회 +
 발주기관 계정
diff --git a/src/main/webapp/com/img/common/icon/ico_btn_big_map.png b/src/main/webapp/com/img/common/icon/ico_btn_big_map.png new file mode 100644 index 0000000..a80da58 Binary files /dev/null and b/src/main/webapp/com/img/common/icon/ico_btn_big_map.png differ diff --git a/src/main/webapp/com/img/common/icon/ico_btn_search.png b/src/main/webapp/com/img/common/icon/ico_btn_search.png new file mode 100644 index 0000000..239f78f Binary files /dev/null and b/src/main/webapp/com/img/common/icon/ico_btn_search.png differ