diff --git a/src/main/java/geoinfo/regi/status/RegiController.java b/src/main/java/geoinfo/regi/status/RegiController.java index aab1f788..2b7d0cc1 100644 --- a/src/main/java/geoinfo/regi/status/RegiController.java +++ b/src/main/java/geoinfo/regi/status/RegiController.java @@ -12,6 +12,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -179,7 +180,7 @@ public class RegiController { model.addAttribute("mCurUrl", mCurUrl); - ArrayList mArray = new ArrayList(); + ArrayList> mArray = new ArrayList>(); ArrayList mArrayTest = new ArrayList(); ArrayList mMenuCount01 = new ArrayList(); ArrayList mMenuCount02 = new ArrayList(); @@ -196,6 +197,7 @@ public class RegiController { int mRESISTIVITY_LINES = 0; // 전기비저항 측선수 int mREFRACTION_LINES = 0; // 굴절법탄성파 측선수 + ArrayList> arrHoleName = null; if ("".equals(mPROJECT_CODE) == false) { // Array 로 받기 @@ -203,13 +205,18 @@ public class RegiController { // map if (mArray.isEmpty() == false) { - mMap = (HashMap) mArray.get(0); + mMap = (HashMap) mArray.get(0); mPROJECT_NAME = mUtil.isNullOb(mMap.get("PROJECT_NAME")); model.addAttribute("mPROJECT_NAME", mPROJECT_NAME); mSTATE = mUtil.isNullOb(mMap.get("STATE")); model.put("mState", mSTATE); + } + //시추공 명을 가져온다. + arrHoleName = masterService.getHoleNamesByProjectCode(params); + model.addAttribute("arrHoleName", arrHoleName); + // 시험정보가져오기 mArrayTest = masterService.getTestInfo(params); model.addAttribute("mArrayTest", mArrayTest); @@ -254,6 +261,7 @@ public class RegiController { if ("CH".equals(mREPORT_TYPE) == true && "".equals(hole) == false) { params.put("PROJECT_CODE", mPROJECT_CODE); params.put("HOLE_CODE", mUtil.isNullOb(mMap.get("PROJECT_CODE")) + hole); + // ----------시험정보---------- // Array 로 받기 diff --git a/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java b/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java index 8131421a..c74c8cc6 100644 --- a/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java +++ b/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java @@ -25,7 +25,7 @@ public interface RegiPageMapper { public int getDisCount() throws Exception; - public ArrayList> getMarray(HashMap params) throws Exception; + public ArrayList> getMarray(HashMap params) throws Exception; public ArrayList> getTestInfo(HashMap params) throws Exception; @@ -190,4 +190,6 @@ public interface RegiPageMapper { List getUnconfinedUsual2(Map params) throws Exception; EgovMap selectModeifyCallReason(HashMap params) throws Exception; + + public ArrayList> getHoleNamesByProjectCode(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/status/service/RegiPageService.java b/src/main/java/geoinfo/regi/status/service/RegiPageService.java index 788dd12a..034c74ad 100644 --- a/src/main/java/geoinfo/regi/status/service/RegiPageService.java +++ b/src/main/java/geoinfo/regi/status/service/RegiPageService.java @@ -25,7 +25,7 @@ public interface RegiPageService { public int getDisCount() throws Exception; - public ArrayList> getMarray(HashMap params) throws Exception; + public ArrayList> getMarray(HashMap params) throws Exception; public ArrayList> getTestInfo(HashMap params) throws Exception; @@ -192,4 +192,5 @@ public interface RegiPageService { EgovMap selectModeifyCallReason(HashMap params) throws Exception; + public ArrayList> getHoleNamesByProjectCode(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java index 1a4eb485..a4dab434 100644 --- a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java +++ b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java @@ -55,7 +55,7 @@ public class RegiPageServiceImpl implements RegiPageService { } @Override - public ArrayList> getMarray(HashMap params) throws Exception { + public ArrayList> getMarray(HashMap params) throws Exception { return regiPageMapper.getMarray(params); } @@ -476,4 +476,9 @@ public class RegiPageServiceImpl implements RegiPageService { return regiPageMapper.selectModeifyCallReason(params); } + @Override + public ArrayList> getHoleNamesByProjectCode(HashMap params) throws Exception { + return regiPageMapper.getHoleNamesByProjectCode(params); + } + } diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml index 1dfe40a8..34e0ed6c 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml @@ -1406,5 +1406,18 @@ INSERT INTO TEMP_SMS_LOG ( WHERE PROJECT_CODE = #{PROJECT_CODE} ]]> + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/web/include/include_left_tree_input.jsp b/src/main/webapp/WEB-INF/views/web/include/include_left_tree_input.jsp index 0377b747..2210e16b 100644 --- a/src/main/webapp/WEB-INF/views/web/include/include_left_tree_input.jsp +++ b/src/main/webapp/WEB-INF/views/web/include/include_left_tree_input.jsp @@ -76,14 +76,18 @@ ictway.comm.framework.dbcp.*,ictway.comm.framework.property.*"%> <% String mHOLE_CODE = (String)request.getAttribute("mHOLE_CODE"); ArrayList mArray = (ArrayList)request.getAttribute("mArray"); + ArrayList> arrHoleName =(ArrayList>)request.getAttribute("arrHoleName"); System.out.println("LabImgList - " + LabImgList); System.out.println("mArray.size() - " + mArray.size()); System.out.println("mArray - " + mArray); + + int k=0; for(int i=0; i < mArray.size(); i++ ){ Lab_img = "x"; mMap = (HashMap)mArray.get(i); + if("0".equals(mUtil.isNullOb(mMap.get("NUM"))) == false && "".equals(mUtil.isNullOb(mMap.get("NUM")))== false){ int cnt = Integer.parseInt(mUtil.isNullOb(mMap.get("NUM"))); for(int j=1; j<=cnt; j++){ @@ -95,11 +99,29 @@ ictway.comm.framework.dbcp.*,ictway.comm.framework.property.*"%> System.out.println("Lab_img - " + Lab_img); mMapCount02 = (HashMap)request.getAttribute("mMapCount02" + hole); System.out.println("mMapCount02 = " + mMapCount02); + + //시추공명을 추가로 넣는다. + String holeName = null; + String thisHoleCode = mUtil.isNullOb(mMap.get("PROJECT_CODE")) + hole; + Iterator> iterator = arrHoleName.iterator(); + + int indexArrHoleName = 0; + while (iterator.hasNext()) { + HashMap mapItem = iterator.next(); + String holeCode = mUtil.isNullOb(mapItem.get("HOLE_CODE")); + if( holeCode.equals(thisHoleCode)) { + holeName = mUtil.isNullOb(mapItem.get("HOLE_NAME")); + // 검색 속도 향상을 위해 찾은 것은 지운다. + arrHoleName.remove(indexArrHoleName); + break; + } + indexArrHoleName++; + } %>
  • class="closed" <%} %>>
    ">
    - &HOLE_CODE=<%=mUtil.isNullOb(mMap.get("PROJECT_CODE"))+hole %>"><%=mUtil.curPageStyle(mHOLE_CODE, mUtil.isNullOb(mMap.get("PROJECT_CODE"))+hole, "header",mCurUrl, hole) %> + &HOLE_CODE=<%=mUtil.isNullOb(mMap.get("PROJECT_CODE"))+hole %>"><%=mUtil.curPageStyle(mHOLE_CODE, mUtil.isNullOb(mMap.get("PROJECT_CODE"))+hole, "header",mCurUrl, hole) %>(<%=mUtil.isNullOb(holeName) %>)