diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java new file mode 100644 index 00000000..8b4f04dd --- /dev/null +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -0,0 +1,69 @@ +package cokr.xit.fims.crdn.web; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import cokr.xit.base.code.CommonCode; +import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.crdn.CrdnQuery; +import cokr.xit.fims.crdn.service.CrdnService; +import cokr.xit.fims.crdn.service.CrdnStngService; + +/**단속자료검사 서비스 웹 컨트롤러.
+ * {웹 컨텍스트}/crdn/crdn02 로 접근할 수 있다. + * @author leebj + */ +public class Crdn02Controller extends ApplicationController { + + @Resource(name="crdnService") + private CrdnService crdnService; + + @Resource(name="crdnStngService") + private CrdnStngService crdnStngService; + + /** 단속 자료 검사 메인화면을 연다. + * @return fims/crdn/crdn02020-main + */ + public ModelAndView crackdownDataInspectionMain() { + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/crdn/crdn02020-main"); + mav.addObject("pageName", "crdn02020-main"); + mav.addObject("module", "type='module'"); + + Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026","FIM054"); + mav.addObject("FIM002List", commonCodes.get("FIM002")); + mav.addObject("FIM003List", commonCodes.get("FIM003")); + mav.addObject("FIM010List", commonCodes.get("FIM010")); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); + + return mav; + } + + /**검사자료 목록을 조회한다.
+ * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 + * @param query 검사자료 목록 조회 조건 + * @return jsonView + * 
 {
+	 *     "crdnList": [조회결과 목록],
+	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
+	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
+	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
+	 * }
+ */ + @RequestMapping(name="검사자료 목록", value="/020/list.do") + public ModelAndView getInspectionDataList(CrdnQuery query) { + switch(query.getInspectionDataType()) { + case "photo" -> query.setGridType("photo"); + case "sameVehicleMain" -> query.setGridType("sameVehicleMain"); + case "sameVehicleSub" -> query.setGridType("sameVehicleSub"); + } + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); + } +} diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java new file mode 100644 index 00000000..9dc3c9f3 --- /dev/null +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -0,0 +1,40 @@ +package cokr.xit.fims.crdn.web; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.web.servlet.ModelAndView; + +import cokr.xit.base.code.CommonCode; +import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.crdn.service.CrdnService; +import cokr.xit.fims.crdn.service.CrdnStngService; + +/**표지정보확인 서비스 웹 컨트롤러.
+ * {웹 컨텍스트}/crdn/crdn03 로 접근할 수 있다. + * @author leebj + */ +public class Crdn03Controller extends ApplicationController { + + @Resource(name="crdnService") + private CrdnService crdnService; + + @Resource(name="crdnStngService") + private CrdnStngService crdnStngService; + + /** 표지정보 미확인 자료 메인화면을 연다. + * @return fims/crdn/crdn03030-main + */ + public ModelAndView tagInformationUndefinedDataMain() { + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/crdn/crdn03030-main"); + mav.addObject("pageName","crdn03030-main"); + + Map> commonCodes = getCodesOf("FIM003", "FIM010"); + addCodes(commonCodes, mav, "FIM003", "FIM010"); + return mav; + } + +} diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn04Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn04Controller.java new file mode 100644 index 00000000..8fc64afd --- /dev/null +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn04Controller.java @@ -0,0 +1,60 @@ +package cokr.xit.fims.crdn.web; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import cokr.xit.base.code.CommonCode; +import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.crdn.CrdnQuery; +import cokr.xit.fims.crdn.service.CrdnService; +import cokr.xit.fims.crdn.service.CrdnStngService; + +/**과태료감경자료 관리 서비스 웹 컨트롤러.
+ * {웹 컨텍스트}/crdn/crdn04 로 접근할 수 있다. + * @author leebj + */ +public class Crdn04Controller extends ApplicationController { + + @Resource(name="crdnService") + private CrdnService crdnService; + + @Resource(name="crdnStngService") + private CrdnStngService crdnStngService; + + /** 과태료 감경 자료 메인화면을 연다. + * @return fims/crdn/crdn04040-main + */ + public ModelAndView fineReductionDataMain() { + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/crdn/crdn04040-main"); + mav.addObject("pageName","crdn04040-main"); + + Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + addCodes(commonCodes, mav, "FIM010", "FIM019"); + return mav; + } + + /**감경자료 목록을 조회한다.
+ * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 + * @param query 감경자료 목록 조회 조건 + * @return jsonView + * 
 {
+	 *     "crdnList": [조회결과 목록],
+	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
+	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
+	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
+	 * }
+ */ + @RequestMapping(name="감경자료 목록", value="/040/list.do") + public ModelAndView getFineReductionDataList(CrdnQuery query) { + query.setGridType("fineReductionData"); + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); + } +} diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index c0175cdc..602453e6 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -43,52 +43,6 @@ public class Crdn06Controller extends ApplicationController { return mav; } - /** 단속 자료 검사 메인화면을 연다. - * @return fims/crdn/crdn06020-main - */ - public ModelAndView crackdownDataInspectionMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn06020-main"); - mav.addObject("pageName", "crdn06020-main"); - mav.addObject("module", "type='module'"); - - Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026","FIM054"); - mav.addObject("FIM002List", commonCodes.get("FIM002")); - mav.addObject("FIM003List", commonCodes.get("FIM003")); - mav.addObject("FIM010List", commonCodes.get("FIM010")); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); - - return mav; - } - - /** 표지정보 미확인 자료 메인화면을 연다. - * @return fims/crdn/crdn06030-main - */ - public ModelAndView tagInformationUndefinedDataMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn06030-main"); - mav.addObject("pageName","crdn06030-main"); - - Map> commonCodes = getCodesOf("FIM003", "FIM010"); - addCodes(commonCodes, mav, "FIM003", "FIM010"); - return mav; - } - - /** 과태료 감경 자료 메인화면을 연다. - * @return fims/crdn/crdn06040-main - */ - public ModelAndView fineReductionDataMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn06040-main"); - mav.addObject("pageName","crdn06040-main"); - - Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - addCodes(commonCodes, mav, "FIM010", "FIM019"); - return mav; - } - /**단속자료 목록을 조회한다.
* {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 * @param query 단속자료 목록 조회 조건 @@ -106,43 +60,4 @@ public class Crdn06Controller extends ApplicationController { return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } - /**검사자료 목록을 조회한다.
- * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param query 검사자료 목록 조회 조건 - * @return jsonView - * 
 {
-	 *     "crdnList": [조회결과 목록],
-	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
-	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
-	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
-	 * }
- */ - @RequestMapping(name="검사자료 목록", value="/020/list.do") - public ModelAndView getInspectionDataList(CrdnQuery query) { - switch(query.getInspectionDataType()) { - case "photo" -> query.setGridType("photo"); - case "sameVehicleMain" -> query.setGridType("sameVehicleMain"); - case "sameVehicleSub" -> query.setGridType("sameVehicleSub"); - } - setFetchSize(query); - return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); - } - - /**감경자료 목록을 조회한다.
- * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param query 감경자료 목록 조회 조건 - * @return jsonView - * 
 {
-	 *     "crdnList": [조회결과 목록],
-	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
-	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
-	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
-	 * }
- */ - @RequestMapping(name="감경자료 목록", value="/040/list.do") - public ModelAndView getFineReductionDataList(CrdnQuery query) { - query.setGridType("fineReductionData"); - setFetchSize(query); - return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); - } } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index af7aae04..dec7b59b 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -71,7 +71,7 @@ public class Cvlc02Controller extends ApplicationController { boolean json = jsonResponse(); ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/cvlc/cvlc01060-info"); - mav.addObject("pageName", "cvlc01060-info"); + mav.addObject("pageName", "cvlc02060-info"); String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); diff --git a/src/main/java/cokr/xit/fims/task/web/BpvController.java b/src/main/java/cokr/xit/fims/task/web/BpvController.java index 43650121..8816ace7 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -15,6 +15,14 @@ public class BpvController { @RequestMapping(name="전용차로과태료업무 민원답변대상자료 업무", value="/BPV/cvlc/cvlc02") class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller {} + @Controller + @RequestMapping(name="전용차로과태료업무 단속자료검사 업무", value="/BPV/crdn/crdn02") + class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller {} + + @Controller + @RequestMapping(name="전용차로과태료업무 과태료감경자료 업무", value="/BPV/crdn/crdn04") + class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {} + @Controller @RequestMapping(name="전용차로과태료업무 단속등록업무", value="/BPV/crdn/crdn05") class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index e2d329f0..c8361038 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -75,50 +75,36 @@ public class CmnController { } @Controller - @RequestMapping(name="단속 자료 등록", value="/crdn/crdn05") - class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller { - /** 단속 자료 등록 메인화면을 연다. - * @return fims/crdn/crdn05010-main - */ - @Override - @RequestMapping(name="단속 자료 등록 메인", value="/010/main.do") - public ModelAndView crackdownDataRegistrationMain() { - return super.crackdownDataRegistrationMain(); - } - } - - @Controller - @RequestMapping(name="단속 관리", value="/crdn/crdn06") - class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller { - /** 단속 관리 메인화면을 연다. - * @return fims/crdn/crdn06010-main - */ - @Override - @RequestMapping(name="단속 관리 메인", value="/010/main.do") - public ModelAndView crackdownManagementMain() { - return super.crackdownManagementMain(); - } - + @RequestMapping(name="단속 자료 검사", value="/crdn/crdn02") + class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller { /** 단속 자료 검사 메인화면을 연다. - * @return fims/crdn/crdn06020-main + * @return fims/crdn/crdn02020-main */ @Override @RequestMapping(name="단속 자료 검사 메인", value="/020/main.do") public ModelAndView crackdownDataInspectionMain() { return super.crackdownDataInspectionMain(); } + } + @Controller + @RequestMapping(name="표지정보 미확인 자료 조회", value="/crdn/crdn03") + class Crdn03Controller extends cokr.xit.fims.crdn.web.Crdn03Controller { /** 표지정보 미확인 자료 메인화면을 연다. - * @return fims/crdn/crdn06030-main + * @return fims/crdn/crdn03030-main */ @Override @RequestMapping(name="표지정보 미확인 자료 메인", value="/030/main.do") public ModelAndView tagInformationUndefinedDataMain() { return super.tagInformationUndefinedDataMain(); } + } + @Controller + @RequestMapping(name="과태료 감경 자료", value="/crdn/crdn04") + class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller { /** 과태료 감경 자료 메인화면을 연다. - * @return fims/crdn/crdn06040-main + * @return fims/crdn/crdn04040-main */ @Override @RequestMapping(name="과태료 감경 자료 메인", value="/040/main.do") @@ -127,6 +113,32 @@ public class CmnController { } } + @Controller + @RequestMapping(name="단속 자료 등록", value="/crdn/crdn05") + class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller { + /** 단속 자료 등록 메인화면을 연다. + * @return fims/crdn/crdn05010-main + */ + @Override + @RequestMapping(name="단속 자료 등록 메인", value="/010/main.do") + public ModelAndView crackdownDataRegistrationMain() { + return super.crackdownDataRegistrationMain(); + } + } + + @Controller + @RequestMapping(name="단속 관리", value="/crdn/crdn06") + class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller { + /** 단속 관리 메인화면을 연다. + * @return fims/crdn/crdn06010-main + */ + @Override + @RequestMapping(name="단속 관리 메인", value="/010/main.do") + public ModelAndView crackdownManagementMain() { + return super.crackdownManagementMain(); + } + } + @Controller @RequestMapping(name="단속팀 관리", value="/crdn/crdn07") class Crdn07Controller extends cokr.xit.fims.crdn.web.Crdn07Controller { diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index bb924042..021a4fc2 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -23,12 +23,13 @@ public class DpvController { class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller {} @Controller - @RequestMapping(name="장애인과태료업무 단속등록업무", value="/DPV/crdn/crdn05") - class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} + @RequestMapping(name="장애인과태료업무 단속자료검사 업무", value="/DPV/crdn/crdn02") + class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller {} @Controller - @RequestMapping(name="장애인과태료업무 단속업무", value="/DPV/crdn/crdn06") - class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller { + @RequestMapping(name="장애인과태료업무 표지정보확인 업무", value="/DPV/crdn/crdn03") + class Crdn03Controller extends cokr.xit.fims.crdn.web.Crdn03Controller { + @Resource(name="crdnService") private CrdnService crdnService; @@ -66,6 +67,18 @@ public class DpvController { } + @Controller + @RequestMapping(name="장애인과태료업무 과태료감경자료 업무", value="/DPV/crdn/crdn04") + class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {} + + @Controller + @RequestMapping(name="장애인과태료업무 단속등록업무", value="/DPV/crdn/crdn05") + class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} + + @Controller + @RequestMapping(name="장애인과태료업무 단속업무", value="/DPV/crdn/crdn06") + class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller {} + @Controller @RequestMapping(name="장애인과태료업무 부과제외 - 부과제외관리", value="/DPV/excl/excl01") class Excl01Controller extends cokr.xit.fims.excl.web.Excl01Controller {} diff --git a/src/main/java/cokr/xit/fims/task/web/EcaController.java b/src/main/java/cokr/xit/fims/task/web/EcaController.java index 5687aa7b..92333955 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -15,6 +15,14 @@ public class EcaController { @RequestMapping(name="전기차과태료업무 민원답변대상자료 업무", value="/ECA/cvlc/cvlc02") class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller {} + @Controller + @RequestMapping(name="전기차과태료업무 단속자료검사 업무", value="/ECA/crdn/crdn02") + class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller {} + + @Controller + @RequestMapping(name="전기차과태료업무 과태료감경자료 업무", value="/ECA/crdn/crdn04") + class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {} + @Controller @RequestMapping(name="전기차과태료업무 단속등록업무", value="/ECA/crdn/crdn05") class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} diff --git a/src/main/java/cokr/xit/fims/task/web/PvsController.java b/src/main/java/cokr/xit/fims/task/web/PvsController.java index 1bde818b..ad722674 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -24,12 +24,9 @@ public class PvsController { class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller {} @Controller - @RequestMapping(name="주정차과태료업무 단속등록업무", value="/PVS/crdn/crdn05") - class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} + @RequestMapping(name="주정차과태료업무 단속자료검사 업무", value="/PVS/crdn/crdn02") + class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller { - @Controller - @RequestMapping(name="주정차과태료업무 단속업무", value="/PVS/crdn/crdn06") - class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller { @Resource(name="crdnService") private CrdnService crdnService; @@ -38,14 +35,14 @@ public class PvsController { /**2시간 초과처리 팝업을 호출한다.
* @param crdnId 단속 ID - * @return crdn06050-info + * @return crdn02050-info */ @RequestMapping(name="2시간 초과 처리 화면 호출", value="/050/info.do") public ModelAndView getOverTimeInfo(String openerPageName, String savedCallbackFuncName, String crdnId) { ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn06050-info"); - mav.addObject("pageName","crdn06050-info"); + mav.setViewName("fims/crdn/crdn02050-info"); + mav.addObject("pageName","crdn02050-info"); DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdnId); @@ -71,6 +68,18 @@ public class PvsController { } + @Controller + @RequestMapping(name="주정차과태료업무 과태료감경자료 업무", value="/PVS/crdn/crdn04") + class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {} + + @Controller + @RequestMapping(name="주정차과태료업무 단속등록업무", value="/PVS/crdn/crdn05") + class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} + + @Controller + @RequestMapping(name="주정차과태료업무 단속업무", value="/PVS/crdn/crdn06") + class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller {} + @Controller @RequestMapping(name="주정차과태료업무 단속팀 관리", value="/PVS/crdn/crdn07") class Crdn07Controller extends cokr.xit.fims.crdn.web.Crdn07Controller {} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02020-main.jsp similarity index 98% rename from src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02020-main.jsp index e866277e..d112736b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02020-main.jsp @@ -553,11 +553,11 @@ $(document).ready(function(){ $P.fnResetAndChangeBiz = (taskSeCd) => { $P.fnReset(); - $P.photoInspectionControl.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn06/020/list.do?inspectionDataType=photo"); + $P.photoInspectionControl.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn02/020/list.do?inspectionDataType=photo"); $P.photoInspectionControl.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt01/020/info.do"); - $P.sameVehicleControl.main.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn06/020/list.do?inspectionDataType=sameVehicleMain"); + $P.sameVehicleControl.main.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn02/020/list.do?inspectionDataType=sameVehicleMain"); $P.sameVehicleControl.main.urls.getInfo = ""; - $P.sameVehicleControl.sub.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn06/020/list.do?inspectionDataType=sameVehicleSub"); + $P.sameVehicleControl.sub.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn02/020/list.do?inspectionDataType=sameVehicleSub"); $P.sameVehicleControl.sub.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt01/020/info.do"); var clsForTask = taskSeCd.toLowerCase(); @@ -750,7 +750,7 @@ $(document).ready(function(){ var params = { "crdnId" : info.data.CRDN_ID, "levyExclSeCd" : levyExclSeCd, - "savedCallbackFuncName" : "pageObject['crdn06020-main']['popupSavedCallback']", + "savedCallbackFuncName" : "pageObject['${pageName}']['popupSavedCallback']", }; ajax.get({ @@ -790,12 +790,12 @@ $(document).ready(function(){ var params = { "crdnId" : info.data.CRDN_ID, - "openerPageName" : "crdn06020-main", - "savedCallbackFuncName" : "pageObject['crdn06020-main']['popupSavedCallback']" + "openerPageName" : "${pageName}", + "savedCallbackFuncName" : "pageObject['${pageName}']['popupSavedCallback']" }; ajax.get({ - url : wctx.url("/PVS/crdn/crdn06/050/info.do"), + url : wctx.url("/PVS/crdn/crdn02/050/info.do"), data : params, success : resp => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp similarity index 98% rename from src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06050-info.jsp rename to src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp index e7eee577..83fc3618 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp @@ -48,7 +48,7 @@ $(document).ready(function(){ $P.formFields = new FimsFormFields("#frmEdit--${pageName}"); $P.crdnControl = new DatasetControl({ - urls : { update : wctx.url("/PVS/crdn/crdn06/050/update.do") }, + urls : { update : wctx.url("/PVS/crdn/crdn02/050/update.do") }, keymapper : info => info ? info.CRDN_ID : "", dataGetter : obj => obj.crdnInfo, formats: {} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03030-main.jsp similarity index 99% rename from src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03030-main.jsp index 823edf03..0078f8bf 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03030-main.jsp @@ -135,9 +135,9 @@ $(document).ready(function(){ **************************************************************************/ $P.crdnControl = new DatasetControl({ urls : { - load : wctx.url("/DPV/crdn/crdn06/030/list.do"), + load : wctx.url("/DPV/crdn/crdn03/030/list.do"), getInfo : wctx.url("/DPV/sprt/sprt01/020/info.do"), - update: wctx.url("/DPV/crdn/crdn06/030/update.do") + update: wctx.url("/DPV/crdn/crdn03/030/update.do") }, dataGetter : obj => obj["List"], appendData:true, keymapper : info => info ? info.CRDN_ID : "", diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn04040-main.jsp similarity index 99% rename from src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/crdn/crdn04040-main.jsp index a8ba49c1..633745bd 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn04040-main.jsp @@ -208,7 +208,7 @@ $(document).ready(function(){ $P.fnResetAndChangeBiz = taskSeCd => { $P.fnReset(); - $P.crdnControl.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn06/040/list.do"); + $P.crdnControl.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn04/040/list.do"); $P.crdnControl.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt01/020/info.do"); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01060-info.jsp rename to src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp