diff --git a/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdnController.java b/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn0600Controller.java similarity index 88% rename from src/main/java/cokr/xit/fims/crdn/web/AbstractCrdnController.java rename to src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn0600Controller.java index 562347d3..838ff160 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdnController.java +++ b/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn0600Controller.java @@ -9,7 +9,7 @@ import cokr.xit.fims.crdn.service.CrdnQuery; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.foundation.web.AbstractController; -public class AbstractCrdnController extends ApplicationController { +public class AbstractCrdn0600Controller extends ApplicationController { @Resource(name="crdnService") private CrdnService crdnService; @@ -36,13 +36,13 @@ public class AbstractCrdnController extends ApplicationController { /**지정하는 단속아이디의 단속 정보를 반환한다. * @param crdnId 단속 아이디 - * @return fims/crdn/initData-info + * @return fims/crdn/crdnData-info *
 {
 	 *     "crdnInfo": {...}
 	 * }
*/ public ModelAndView getCrdnInfo(String crdnId) { - ModelAndView mav = new ModelAndView("fims/crdn/initData-info"); + ModelAndView mav = new ModelAndView("fims/crdn/crdnData-info"); if (!isEmpty(crdnId)) { mav.addObject("crdnInfo", crdnService.getCrdnInfo(crdnId)); } diff --git a/src/main/java/cokr/xit/fims/crdn/web/CrdnController.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn0600Controller.java similarity index 80% rename from src/main/java/cokr/xit/fims/crdn/web/CrdnController.java rename to src/main/java/cokr/xit/fims/crdn/web/Crdn0600Controller.java index 98babbf5..109018f0 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/CrdnController.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn0600Controller.java @@ -22,22 +22,24 @@ import cokr.xit.foundation.web.AbstractController; */ @Controller @RequestMapping(name="단속관리", value="/crdn") -public class CrdnController extends AbstractCrdnController { +public class Crdn0600Controller extends AbstractCrdn0600Controller { @Resource(name = "codeService") private CodeService codeService; - /** 단속 초기자료 관리 메인화면을 연다. - * @return fims/crdn/initData-main + /** 단속 자료 조회 메인화면을 연다. + * @return fims/crdn/crdnDataInquire-main */ - @RequestMapping(name="단속 초기자료 메인", value="/initData/main.do") - public ModelAndView initDataMain() { + @RequestMapping(name="단속 자료 조회 메인", value="/crdn0600/main.do") + public ModelAndView crdnDataInquireMain() { ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/initData-main"); - mav.addObject("pageSuffix","initData-main"); + mav.setViewName("fims/crdn/crdnDataInquire-main"); + mav.addObject("pageSuffix","crdnDataInquire-main"); - Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM026"); - mav.addObject("FIM001", commonCodes.get("FIM001")); + Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM010", "FIM026"); + mav.addObject("FIM001List", commonCodes.get("FIM001")); + mav.addObject("FIM002List", commonCodes.get("FIM002")); + mav.addObject("FIM010List", commonCodes.get("FIM010")); addCodes(commonCodes, mav, "FIM002", "FIM026"); return mav; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/initData-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp similarity index 88% rename from src/main/webapp/WEB-INF/jsp/fims/crdn/initData-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp index 522a8732..d9241b31 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/initData-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp @@ -25,29 +25,14 @@
- - - - - - - - - - <%-- - - - - --%> + + +
@@ -66,27 +51,27 @@
- - <%-- - - --%> - - +
- <%-- - - --%> + + - -