From f0446fb048b221c1e5f1988701d887cb92be5267 Mon Sep 17 00:00:00 2001 From: jjh Date: Thu, 10 Aug 2023 18:42:32 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=98=EA=B2=AC=EC=A0=9C=EC=B6=9C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EA=B2=B0=EA=B3=BC=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/excl/web/Excl02Controller.java | 31 ++- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 24 +- .../WEB-INF/jsp/fims/excl/excl01020-info.jsp | 2 +- .../WEB-INF/jsp/fims/excl/excl02010-main.jsp | 61 ++++- .../WEB-INF/jsp/fims/excl/excl02020-info.jsp | 8 +- .../WEB-INF/jsp/fims/excl/excl02030-info.jsp | 251 ++++++++++++++++++ .../WEB-INF/jsp/fims/excl/excl03010-main.jsp | 24 +- 7 files changed, 354 insertions(+), 47 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/fims/excl/excl02030-info.jsp diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index edb41de0..1d88e17a 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -73,7 +73,7 @@ public class Excl02Controller extends ApplicationController { /**지정한 ID의 의견제출 정보를 반환한다. * @param opnnId 의견제출 ID - * @return fims/excl/excl02010-main 또는 jsonView + * @return fims/excl/excl02020-info 또는 jsonView * 
{
 	 *     "opnnSbmsnInfo": 의견제출 정보
 	 * }
@@ -87,7 +87,7 @@ public class Excl02Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl02020-info"); // View(jsp)에서 사용할 공통코드를 조회 - Map> commonCodes = getCodesOf("FIM029", "FIM030", "FIM031", "FIM032", "FIM033", "FIM054"); + Map> commonCodes = getCodesOf("FIM029", "FIM030", "FIM032", "FIM033", "FIM054"); return mav .addObject("pageName", "excl02020") @@ -162,4 +162,31 @@ public class Excl02Controller extends ApplicationController { .addObject("saved", saved); } + /**지정한 ID의 의견제출 결과 정보를 반환한다. + * @param opnnId 의견제출 ID + * @return fims/excl/excl02030-info 또는 jsonView + * 
{
+	 *     "opnnSbmsnSttsInfo": 의견제출 정보
+	 * }
+ */ + @RequestMapping(name = "의견제출 결과 처리 조회", value = "/030/info.do") + public ModelAndView getOpnnSbmsnSttsInfo(Excl02Query req) { + DataObject opnnSbmsnInfo = excl02Service.getOpnnSbmsnInfo(req); + + boolean json = jsonResponse(); + + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl02030-info"); + + // View(jsp)에서 사용할 공통코드를 조회 + Map> commonCodes = getCodesOf("FIM030", "FIM031", "FIM033", "FIM054"); + + return mav + .addObject("pageName", "excl02030") + .addObject("FIM030List", commonCodes.get("FIM030")) // 통보 구분 코드(NTFCTN_SE_CD) + .addObject("FIM031List", commonCodes.get("FIM031")) // 의견 제출 상태 코드(OPNN_SBMSN_STTS_CD) + .addObject("FIM033List", commonCodes.get("FIM033")) // 의견 제출 구분 코드(OPNN_SBMSN_SE_CD) + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + .addObject("opnnSbmsnInfo", json ? opnnSbmsnInfo : toJson(opnnSbmsnInfo)) + ; + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index fc951b45..8b05259a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -13,14 +13,14 @@
- - - @@ -171,10 +171,10 @@
- - @@ -453,7 +453,7 @@ // if ((el[0].scrollHeight - el.scrollTop() + 17) == el.outerHeight()) { if ((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()) { - fnSearchList${pageName}(${pageName}Control.query.pageNum + 1); + fnBtnSearchList${pageName}(${pageName}Control.query.pageNum + 1); } }); } @@ -481,7 +481,7 @@ **************************************************************************/ // 업무구분 변경 function fnResetAndChangeBiz${pageName}(taskSeCd) { - fnReset${pageName}(); + fnBtnReset${pageName}(); } // 검색 조건 파라미터 가져오기 @@ -496,12 +496,12 @@ } // 초기화 - function fnReset${pageName}() { + function fnBtnReset${pageName}() { initForm${pageName}(); } // 검색 - function fnSearchList${pageName}(pageNumber) { + function fnBtnSearchList${pageName}(pageNumber) { // pageNumber 값 확인 if (!pageNumber) pageNumber = 1; @@ -511,12 +511,12 @@ } // 엑셀 - function fnExcel${pageName}() { + function fnBtnExcel${pageName}() { } // 수정 - function fnModify${pageName}() { + function fnBtnUpdate${pageName}() { let levyExclId = ${pageName}Control.dataset.getValue("LEVY_EXCL_ID"); // 부과제외ID 가 없다면.. return @@ -532,7 +532,7 @@ } // 삭제 - function fnRemove${pageName}() { + function fnBtnRemove${pageName}() { dialog.alert({ content : "선택한 ${prefixName} 정보를 삭제하시겠습니까?" , onOK : () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp index b73e9d40..f575faaf 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp @@ -174,7 +174,7 @@ let data = formFields.get(); dialog.alert({ - content : "현재 부과제외 정보를 저장하시겠습니까?" + content : "현재 ${prefixName} 정보를 저장하시겠습니까?" , onOK : () => { ${pageName}Control.save(formFields.get()); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp index d5db40b9..92c5f30c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp @@ -13,14 +13,14 @@
- - - @@ -172,15 +172,18 @@
- - - +
@@ -353,6 +356,24 @@ $("#btnRemove--${pageName}").prop("disabled", keys.length < 1); }; + // 심의 dialog + ${pageName}Control.getStatusInfo = (opnnId) => { + ajax.get({ + url : wctx.url(prefixUrl + "/030/info.do") + , data : { opnnId : opnnId } + , success : resp => { + resp = resp.replace(/infoPrefix/g, this.prefix) + .replace(/prefixName/g, this.prefixName) + dialog.open({ + id : ${pageName}Control.prefixed("dialog") + , title : "의견제출 결과 처리" + , content : resp + , size : "lg" + }); + } + }); + } + // 개별총정보 dialog ${pageName}Control.getTotalInfo = (crdnId) => { if (crdnId == undefined || crdnId == "") { @@ -411,7 +432,7 @@ if (el.scrollTop() == 0) return; if ((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()) { - fnSearchList${pageName}(${pageName}Control.query.pageNum + 1); + fnBtnSearchList${pageName}(${pageName}Control.query.pageNum + 1); } }); } @@ -439,7 +460,7 @@ **************************************************************************/ // 업무구분 변경 function fnResetAndChangeBiz${pageName}(taskSeCd) { - fnReset${pageName}(); + fnBtnReset${pageName}(); } // 검색 조건 파라미터 가져오기 @@ -454,12 +475,12 @@ } // 초기화 - function fnReset${pageName}() { + function fnBtnReset${pageName}() { initForm${pageName}(); } // 검색 - function fnSearchList${pageName}(pageNumber) { + function fnBtnSearchList${pageName}(pageNumber) { // pageNumber 값 확인 if (!pageNumber) pageNumber = 1; @@ -469,12 +490,12 @@ } // 엑셀 - function fnExcel${pageName}() { + function fnBtnExcel${pageName}() { } // 등록 - 테스트 - function fnCreate${pageName}() { + function fnBtnCreate${pageName}() { let params = { crdnId : "00004148020220007304" // crdnId : "20234148020230000071" @@ -484,7 +505,7 @@ } // 수정 - function fnModify${pageName}() { + function fnBtnUpdate${pageName}() { let opnnId = ${pageName}Control.dataset.getValue("OPNN_ID"); // 의견제출 ID 가 없다면.. return @@ -500,7 +521,7 @@ } // 삭제 - function fnRemove${pageName}() { + function fnBtnRemove${pageName}() { dialog.alert({ content : "선택한 ${prefixName} 정보를 삭제하시겠습니까?" , onOK : () => { @@ -509,6 +530,18 @@ }); } + // 심의 + function fnBtnUpdateStatus${pageName}() { + let opnnId = ${pageName}Control.dataset.getValue("OPNN_ID"); + + // 의견제출 ID 가 없다면.. return + if (opnnId == undefined || opnnId == "") { + return; + } + + ${pageName}Control.getStatusInfo(opnnId); + } + /************************************************************************** * script 진입 **************************************************************************/ diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp index 3f242607..2f231ffa 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp @@ -68,7 +68,7 @@
-
@@ -198,10 +198,6 @@ dialog.alert("저장됐습니다."); dialog.close(${pageName}Control.prefix + "dialog"); } -// if (resp.retSaved == "true") { -// dialog.alert(resp.retMessage); -// dialog.close(${pageName}Control.prefix + "dialog"); -// } } // 저장 @@ -262,7 +258,7 @@ * function **************************************************************************/ // 납부자 정보 - function fnPayer${pageName}() { + function fnBtnPayer${pageName}() { // 수정이라면 동작하지 않게 한다. if (${pageName}Control.getValue("OPNN_ID") != "") { return; diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02030-info.jsp new file mode 100644 index 00000000..a0b9c46e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02030-info.jsp @@ -0,0 +1,251 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> + + +
+ +
+ + + + + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+ +
+ + +
+ +
+ + +
+
+
+ + + + + +
+ + + +
+ + + + + + +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp index fa12b175..17738c9e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp @@ -14,14 +14,14 @@
- - - @@ -140,10 +140,10 @@
- - @@ -370,7 +370,7 @@ if (el.scrollTop() == 0) return; if ((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()) { - fnSearchList${pageName}(${pageName}Control.query.pageNum + 1); + fnBtnSearchList${pageName}(${pageName}Control.query.pageNum + 1); } }); } @@ -398,7 +398,7 @@ **************************************************************************/ // 업무구분 변경 function fnResetAndChangeBiz${pageName}(taskSeCd) { - fnReset${pageName}(); + fnBtnReset${pageName}(); } // 검색 조건 파라미터 가져오기 @@ -413,12 +413,12 @@ } // 초기화 - function fnReset${pageName}() { + function fnBtnReset${pageName}() { initForm${pageName}(); } // 검색 - function fnSearchList${pageName}(pageNumber) { + function fnBtnSearchList${pageName}(pageNumber) { // pageNumber 값 확인 if (!pageNumber) pageNumber = 1; @@ -428,12 +428,12 @@ } // 엑셀 - function fnExcel${pageName}() { + function fnBtnExcel${pageName}() { } // 저장 - function fnSave${pageName}() { + function fnBtnCreate${pageName}() { let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); // 부과제외ID 가 없다면.. return @@ -454,7 +454,7 @@ } // 이전 단속정보 보기 - function fnBfrCrdnTotalInfo${pageName}() { + function fnBtnBfrCrdnTotalInfo${pageName}() { let bfrCrdnId = ${pageName}Control.dataset.getValue("BFR_CRDN_ID"); // 개별총정보 dialog