From 1e19a6033e7790e0d1cfcf4924312ca51d4bf5e3 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 22 Aug 2023 16:31:23 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EC=BB=A8=ED=8A=B8?= =?UTF-8?q?=EB=A1=A4=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/cvlc/web/Cvlc01Controller.java | 110 +----------------- .../xit/fims/cvlc/web/Cvlc02Controller.java | 101 +++++++++++++++- .../xit/fims/cvlc/web/Cvlc03Controller.java | 19 +++ .../cokr/xit/fims/task/web/BpvController.java | 4 +- .../cokr/xit/fims/task/web/CmnController.java | 15 ++- .../cokr/xit/fims/task/web/DpvController.java | 4 +- .../cokr/xit/fims/task/web/EcaController.java | 4 +- .../cokr/xit/fims/task/web/PvsController.java | 4 +- ...{cvlc01030-main.jsp => cvlc02030-main.jsp} | 6 +- 9 files changed, 138 insertions(+), 129 deletions(-) rename src/main/webapp/WEB-INF/jsp/fims/cvlc/{cvlc01030-main.jsp => cvlc02030-main.jsp} (99%) diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java index fe63f61f..ef4f77aa 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -26,7 +26,7 @@ import cokr.xit.fims.cvlc.service.CrdnCvlcptService; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; -/**민원1 서비스 웹 컨트롤러.
+/**민원접수자료 서비스 웹 컨트롤러.
* {웹 컨텍스트}/cvlc/cvlc01 로 접근할 수 있다. * @author leebj */ @@ -54,22 +54,6 @@ public class Cvlc01Controller extends ApplicationController { return mav; } - /** 민원 답변 대상 자료 메인화면을 연다. - * @return fims/cvlc/cvlc01030-main - */ - public ModelAndView civilComplaintAnswerTargetDataMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/cvlc/cvlc01030-main"); - mav.addObject("pageName", "cvlc01030-main"); - - Map> commonCodes = getCodesOf("FIM017","FIM022", "FIM026", "FIM054"); - mav.addObject("FIM017List", commonCodes.get("FIM017")); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - addCodes(commonCodes, mav, "FIM022"); - addCodes(commonCodes, mav, "FIM026"); - return mav; - } - /** 민원내역 원본 보기 팝업 화면을 연다. * @return fims/cvlc/cvlc01050-info */ @@ -165,41 +149,6 @@ public class Cvlc01Controller extends ApplicationController { return mav; } - /**민원답변대상자료 목록을 조회한다.
- * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param query 민원답변대상자료 목록 조회 조건 - * @return jsonView - * 
 {
-	 *     "crdnList": [조회결과 목록],
-	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
-	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
-	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
-	 * }
- */ - @RequestMapping(name="민원답변대상자료 목록", value="/030/list.do") - public ModelAndView selectCivilComplaintAnswerTargetDataList(CrdnQuery query) { - query.setGridType("answerTargetData"); - setFetchSize(query); - return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query), ""); - } - - /**민원자료 목록을 조회한다.
- * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param query 민원자료 목록 조회 조건 - * @return jsonView - * 
 {
-	 *     "crdnList": [조회결과 목록],
-	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
-	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
-	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
-	 * }
- */ - @RequestMapping(name="민원자료 목록", value="/040/list.do") - public ModelAndView getCivilComplaintList(CrdnQuery query) { - setFetchSize(query); - return setCollectionInfo(new ModelAndView("jsonView"),crdnCvlcptService.getCivilComplaintList(query),""); - } - /**지정한 민원자료를 제거한다. * @param crdnId 단속대장 아이디 * @return jsonView @@ -309,61 +258,4 @@ public class Cvlc01Controller extends ApplicationController { return mav; } - /** 민원답변내용 미리보기 화면을 연다. - * @return - */ - @RequestMapping(name="민원답변내용 미리보기", value="/060/info.do") - public ModelAndView answerPreviewInfo(HttpServletRequest hReq, CrdnQuery query) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/cvlc/cvlc01060-info"); - - mav.addObject("pageName", "cvlc01060-info"); - String urlTaskSeCd = hReq.getServletPath().split("/")[1]; - mav.addObject("taskSeCd", urlTaskSeCd); - - query.setTaskSeCd(urlTaskSeCd); - DataObject cvlcptInfo = crdnCvlcptService.getAnswerPreview(query); - mav.addObject("cvlcptInfo", json ? cvlcptInfo : toJson(cvlcptInfo)); - - return mav; - } - - /**지정한 민원 자료의 답변 내용을 저장한다. - * @param crdnCvlcpt 단속민원 정보 - * @return jsonView - * 
 {
-	 *     "affected": 저장된 정보수
-	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
-	 * }
- */ - @RequestMapping(name="답변 내용 저장", value="/060/update.do") - public ModelAndView updateAnswerContent(CrdnCvlcpt crdnCvlcpt) { - - boolean saved = false; - - saved = crdnCvlcptService.updateAnswerContent(crdnCvlcpt); - - return new ModelAndView("jsonView") - .addObject("saved", saved); - } - - /**민원 답변 대상 자료의 처리 상태를 변경한다. - * @param crdnCvlcpt 단속민원 정보 - * @return jsonView - * 
 {
-	 *     "affected": 저장된 정보수
-	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
-	 * }
- */ - @RequestMapping(name="답변 내용 저장", value="/030/update.do") - public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIDs) { - - boolean saved = false; - - saved = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, crdnIDs); - - return new ModelAndView("jsonView") - .addObject("saved", saved); - } - } 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 8f7ad7b6..af7aae04 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -1,12 +1,23 @@ package cokr.xit.fims.cvlc.web; +import java.util.List; +import java.util.Map; + import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +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.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; +import cokr.xit.foundation.data.DataObject; -/**민원2 서비스 웹 컨트롤러.
+/**민원답변대상자료 서비스 웹 컨트롤러.
* {웹 컨텍스트}/cvlc/cvlc02 로 접근할 수 있다. * @author leebj */ @@ -18,6 +29,94 @@ public class Cvlc02Controller extends ApplicationController { @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; + /** 민원 답변 대상 자료 메인화면을 연다. + * @return fims/cvlc/cvlc02030-main + */ + public ModelAndView civilComplaintAnswerTargetDataMain() { + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/cvlc/cvlc02030-main"); + mav.addObject("pageName", "cvlc02030-main"); + + Map> commonCodes = getCodesOf("FIM017","FIM022", "FIM026", "FIM054"); + mav.addObject("FIM017List", commonCodes.get("FIM017")); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + addCodes(commonCodes, mav, "FIM022"); + addCodes(commonCodes, mav, "FIM026"); + return mav; + } + + /**민원답변대상자료 목록을 조회한다.
+ * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 + * @param query 민원답변대상자료 목록 조회 조건 + * @return jsonView + * 
 {
+	 *     "crdnList": [조회결과 목록],
+	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
+	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
+	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
+	 * }
+ */ + @RequestMapping(name="민원답변대상자료 목록", value="/030/list.do") + public ModelAndView selectCivilComplaintAnswerTargetDataList(CrdnQuery query) { + query.setGridType("answerTargetData"); + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query), ""); + } + + /** 민원답변내용 미리보기 화면을 연다. + * @return + */ + @RequestMapping(name="민원답변내용 미리보기", value="/060/info.do") + public ModelAndView answerPreviewInfo(HttpServletRequest hReq, CrdnQuery query) { + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/cvlc/cvlc01060-info"); + + mav.addObject("pageName", "cvlc01060-info"); + String urlTaskSeCd = hReq.getServletPath().split("/")[1]; + mav.addObject("taskSeCd", urlTaskSeCd); + + query.setTaskSeCd(urlTaskSeCd); + DataObject cvlcptInfo = crdnCvlcptService.getAnswerPreview(query); + mav.addObject("cvlcptInfo", json ? cvlcptInfo : toJson(cvlcptInfo)); + + return mav; + } + + /**지정한 민원 자료의 답변 내용을 저장한다. + * @param crdnCvlcpt 단속민원 정보 + * @return jsonView + * 
 {
+	 *     "affected": 저장된 정보수
+	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
+	 * }
+ */ + @RequestMapping(name="답변 내용 저장", value="/060/update.do") + public ModelAndView updateAnswerContent(CrdnCvlcpt crdnCvlcpt) { + + boolean saved = false; + + saved = crdnCvlcptService.updateAnswerContent(crdnCvlcpt); + + return new ModelAndView("jsonView") + .addObject("saved", saved); + } + + /**민원 답변 대상 자료의 처리 상태를 변경한다. + * @param crdnCvlcpt 단속민원 정보 + * @return jsonView + * 
 {
+	 *     "affected": 저장된 정보수
+	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
+	 * }
+ */ + @RequestMapping(name="답변 내용 저장", value="/030/update.do") + public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIDs) { + + boolean saved = false; + saved = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, crdnIDs); + return new ModelAndView("jsonView") + .addObject("saved", saved); + } } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java index 273e287f..ea3fb887 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -5,10 +5,12 @@ 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.cvlc.service.CrdnCvlcptService; @@ -37,4 +39,21 @@ public class Cvlc03Controller extends ApplicationController { addCodes(commonCodes, mav, "FIM026"); return mav; } + + /**민원자료 목록을 조회한다.
+ * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 + * @param query 민원자료 목록 조회 조건 + * @return jsonView + * 
 {
+	 *     "crdnList": [조회결과 목록],
+	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
+	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
+	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
+	 * }
+ */ + @RequestMapping(name="민원자료 목록", value="/040/list.do") + public ModelAndView getCivilComplaintList(CrdnQuery query) { + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"),crdnCvlcptService.getCivilComplaintList(query),""); + } } 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 861e0991..43650121 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RequestMapping; public class BpvController { @Controller - @RequestMapping(name="전용차로과태료업무 민원1업무", value="/BPV/cvlc/cvlc01") + @RequestMapping(name="전용차로과태료업무 민원접수자료 업무", value="/BPV/cvlc/cvlc01") class Cvlc01Controller extends cokr.xit.fims.cvlc.web.Cvlc01Controller {} @Controller - @RequestMapping(name="전용차로과태료업무 민원2업무", value="/BPV/cvlc/cvlc02") + @RequestMapping(name="전용차로과태료업무 민원답변대상자료 업무", value="/BPV/cvlc/cvlc02") class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller {} @Controller 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 90923e9e..e2d329f0 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -9,7 +9,7 @@ import org.springframework.web.servlet.ModelAndView; public class CmnController { @Controller - @RequestMapping(name="민원1", value="/cvlc/cvlc01") + @RequestMapping(name="민원접수자료 관리 업무", value="/cvlc/cvlc01") class Cvlc01Controller extends cokr.xit.fims.cvlc.web.Cvlc01Controller { /** 민원 접수 자료 메인화면을 연다. * @return fims/cvlc/cvlc01010-main @@ -19,9 +19,14 @@ public class CmnController { public ModelAndView civilComplaintReceiptDataMain() { return super.civilComplaintReceiptDataMain(); } + } + + @Controller + @RequestMapping(name="민원답변대상자료 관리 업무", value="/cvlc/cvlc02") + class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller { /** 민원 답변 대상 자료 메인화면을 연다. - * @return fims/cvlc/cvlc01030-main + * @return fims/cvlc/cvlc02030-main */ @Override @RequestMapping(name="민원 답변 대상 자료 메인", value="/030/main.do") @@ -31,12 +36,6 @@ public class CmnController { } - @Controller - @RequestMapping(name="민원2", value="/cvlc/cvlc02") - class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller { - - } - @Controller @RequestMapping(name="민원관리", value="/cvlc/cvlc03") class Cvlc03Controller extends cokr.xit.fims.cvlc.web.Cvlc03Controller { 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 ab65fc72..bb924042 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -15,11 +15,11 @@ import cokr.xit.fims.crdn.service.CrdnService; public class DpvController { @Controller - @RequestMapping(name="장애인과태료업무 민원1업무", value="/DPV/cvlc/cvlc01") + @RequestMapping(name="장애인과태료업무 민원접수자료 업무", value="/DPV/cvlc/cvlc01") class Cvlc01Controller extends cokr.xit.fims.cvlc.web.Cvlc01Controller {} @Controller - @RequestMapping(name="장애인과태료업무 민원2업무", value="/DPV/cvlc/cvlc02") + @RequestMapping(name="장애인과태료업무 민원답변대상자료 업무", value="/DPV/cvlc/cvlc02") class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller {} @Controller 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 341b4a4d..5687aa7b 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RequestMapping; public class EcaController { @Controller - @RequestMapping(name="전기차과태료업무 민원1업무", value="/ECA/cvlc/cvlc01") + @RequestMapping(name="전기차과태료업무 민원접수자료 업무", value="/ECA/cvlc/cvlc01") class Cvlc01Controller extends cokr.xit.fims.cvlc.web.Cvlc01Controller {} @Controller - @RequestMapping(name="전기차과태료업무 민원2업무", value="/ECA/cvlc/cvlc02") + @RequestMapping(name="전기차과태료업무 민원답변대상자료 업무", value="/ECA/cvlc/cvlc02") class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller {} @Controller 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 ed263f32..1bde818b 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -16,11 +16,11 @@ import cokr.xit.foundation.data.DataObject; public class PvsController { @Controller - @RequestMapping(name="주정차과태료업무 민원1업무", value="/PVS/cvlc/cvlc01") + @RequestMapping(name="주정차과태료업무 민원접수자료 업무", value="/PVS/cvlc/cvlc01") class Cvlc01Controller extends cokr.xit.fims.cvlc.web.Cvlc01Controller {} @Controller - @RequestMapping(name="주정차과태료업무 민원2업무", value="/PVS/cvlc/cvlc02") + @RequestMapping(name="주정차과태료업무 민원답변대상자료 업무", value="/PVS/cvlc/cvlc02") class Cvlc02Controller extends cokr.xit.fims.cvlc.web.Cvlc02Controller {} @Controller diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02030-main.jsp similarity index 99% rename from src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01030-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02030-main.jsp index e109303d..f6f0b22e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02030-main.jsp @@ -296,9 +296,9 @@ $(document).ready(function(){ $P.fnResetAndChangeBiz = taskSeCd => { $P.fnReset(); - $P.crdnControl.urls.load = wctx.url("/"+taskSeCd+"/cvlc/cvlc01/030/list.do"); + $P.crdnControl.urls.load = wctx.url("/"+taskSeCd+"/cvlc/cvlc02/030/list.do"); $P.crdnControl.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt01/020/info.do"); - $P.crdnControl.urls.update = wctx.url("/"+taskSeCd+"/cvlc/cvlc01/030/update.do"); + $P.crdnControl.urls.update = wctx.url("/"+taskSeCd+"/cvlc/cvlc02/030/update.do"); } $P.refreshCrdnList = () => { @@ -448,7 +448,7 @@ $(document).ready(function(){ var dialogId = "answerPreviewDialog--${pageName}"; ajax.get({ - url : wctx.url("/"+taskSeCd+"/cvlc/cvlc01/060/info.do"), + url : wctx.url("/"+taskSeCd+"/cvlc/cvlc02/060/info.do"), data : { crdnId : cur["CRDN_ID"] }, success : resp => { dialog.open({