diff --git a/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java b/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java index 2cdba33a..7bb599dd 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java @@ -16,8 +16,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import com.fasterxml.jackson.databind.ObjectMapper; + import comm.util.strUtil; import egovframework.com.json.JSONObject; +import geoinfo.regi.common.service.CommonService; import geoinfo.regi.holeCoordinate.service.HoleCoordinateService; import geoinfo.regi.manageList.service.ManageListService; import geoinfo.regi.status.service.RegiPageService; @@ -28,6 +31,9 @@ import ictway.comm.web.WebUtil; @Controller public class HoleCoordinateController { + @Resource(name = "commonService") + private CommonService commService; + @Resource(name = "holeCoordinateService") private HoleCoordinateService masterService; @@ -146,7 +152,7 @@ public class HoleCoordinateController { strUtil sUtil = new strUtil(); WebUtil wUtil = new WebUtil(); wUtil.topTabId = "manageCoordinate"; // 검수일때 tab 활성화 시켜주기 위해 - + ObjectMapper mapper = new ObjectMapper(); // request String PROJECT_CODE = sUtil.checkNull(parseData.parseData(String.valueOf(params.get("PROJECT_CODE")))); @@ -154,6 +160,8 @@ public class HoleCoordinateController { ArrayList arrayColumn = new ArrayList(); ArrayList arrayCommon = new ArrayList(); HashMap mapCommon = new HashMap(); + HashMap mapCoor = new HashMap(); // 좌표계 selectBox + ArrayList arrayCoor = new ArrayList(); int count = 0; @@ -163,10 +171,24 @@ public class HoleCoordinateController { params.put("PROJECT_CODE", PROJECT_CODE); String pName = masterService.getCoordName(params); ArrayList> result = masterService.getCoordList(params); + //**************************************좌표정보**************************************// + arrayCoor = commService.getCoordinateQuery(); + // Array 로 받기 + + //SelectBox형태로 map으로 받기 + mapCoor = wUtil.getCommCodeSel("COORDINATE_1,COORDINATE_3", arrayCoor,""); + + String param = "onclick=\"fn_onSelChangeCoor(document.frmHeader.HOLE_COORDINATE_E, document.frmHeader.HOLE_COORDINATE, 'COORDINATE_1_COORDINATE_2', 'COORDINATE_3'); fn_CoorInputType();\" validNm=\"타원체\""; + wUtil.getCommCodeRad("COORDINATE_2",arrayCoor,mapCoor,param); + + + model.put("arrayCoor", arrayCoor); //타원체 + model.put("mapCoor", mapCoor); // 좌표계 model.addAttribute("projectCode", PROJECT_CODE); model.addAttribute("pName", pName); model.addAttribute("result", result); + model.addAttribute("jsonResult", mapper.writeValueAsString(result)); return "/web/manage/hole_coord_modify"; }; diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml index a25a2867..635f8db4 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml @@ -187,6 +187,7 @@ , HOLE_OR_Y , HOLE_LOCATION_X , HOLE_LOCATION_Y + , HOLE_COORDINATE FROM TEMP_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE} ORDER BY HOLE_CODE diff --git a/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp b/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp index 37f22b53..bb1a2b52 100644 --- a/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp +++ b/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp @@ -6,10 +6,47 @@ @@ -87,6 +177,9 @@ function fn_help_tour(){
| ${result.holeCode} - | ${result.holeName} | - --%> | @@ -173,7 +271,7 @@ function fn_help_tour(){ | - + |