From a878a24fb378f3528b76645161da862499a4b898 Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Wed, 17 Sep 2025 15:53:34 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=98=EC=86=A1=20=EC=9E=AC=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/chongno/JasperController.java | 52 ++++---- .../WEB-INF/jsp/fims/sndb/sndb01020-info.jsp | 24 ++-- .../WEB-INF/jsp/fims/sndb/sndb01060-info.jsp | 20 ++- .../WEB-INF/jsp/fims/sndb/sndb01080-info.jsp | 50 +------- .../WEB-INF/jsp/fims/sndb/sndb01100-info.jsp | 41 ++++-- .../WEB-INF/jsp/fims/sndb/sndb01220-main.jsp | 65 +++++++++- .../webapp/WEB-INF/report/notice-a4.jasper | Bin 36638 -> 39061 bytes .../webapp/WEB-INF/report/notice-a4.jrxml | 93 ++++++++++---- .../webapp/WEB-INF/report/prenotice-a4.jasper | Bin 37523 -> 40214 bytes .../webapp/WEB-INF/report/prenotice-a4.jrxml | 119 ++++++++++++------ .../resources/js/fims/sndb/sndb01020.js | 35 ++++-- .../resources/js/fims/sndb/sndb01060.js | 41 +++--- .../resources/js/fims/sndb/sndb01220.js | 4 +- .../resources/js/fims/sndb/woopyonmoa.js | 42 +++++++ 14 files changed, 408 insertions(+), 178 deletions(-) diff --git a/src/main/java/cokr/xit/fims/chongno/JasperController.java b/src/main/java/cokr/xit/fims/chongno/JasperController.java index 608fc11..66b5ad0 100644 --- a/src/main/java/cokr/xit/fims/chongno/JasperController.java +++ b/src/main/java/cokr/xit/fims/chongno/JasperController.java @@ -113,7 +113,7 @@ public class JasperController extends AbstractController { } @RequestMapping(name="사전통지서 미리보기", value="/prenotice.do") - public ModelAndView previewPrenotice(SndbQuery req, FimsPrintOption printOption) { + public ModelAndView previewPrenotice(SndbQuery req) { List dtlList = sndngDtlService.getDetailList(List.of(req.getSndngId())); String[] crdnIds = dtlList.stream().map(row -> row.string("CRDN_ID")).toList().toArray(new String[dtlList.size()]); Map> crdnFiles = fileBean.getFilesOf(Crdn.INF_TYPE, crdnIds).stream() @@ -129,33 +129,28 @@ public class JasperController extends AbstractController { userPhoneNo = user.getPhoneNo(), userEmail = user.getEmailAddress(); List inputStreams = dtlList.stream() - .flatMap(crdn -> { - crdn.set("CRDN_YMD_TM", DataFormat.yyyy_mm_dd(crdn.get("CRDN_YMD")) + " " + DataFormat.hh_mm_ss(crdn.get("CRDN_TM"))) - .set("ADVNTCE_DUDT_YMD", DataFormat.yyyy_mm_dd(crdn.get("ADVNTCE_DUDT_YMD"))) + .flatMap(dtl -> { + dtl.set("CRDN_YMD_TM", DataFormat.yyyy_mm_dd(dtl.get("CRDN_YMD")) + " " + DataFormat.hh_mm_ss(dtl.get("CRDN_TM"))) + .set("ADVNTCE_DUDT_YMD", DataFormat.yyyy_mm_dd(dtl.get("ADVNTCE_DUDT_YMD"))) .set("issueYear", year).set("issueMonth", month).set("issueDay", day) .set("managerName", userName).set("managerPhoneNo", userPhoneNo).set("managerEmail", userEmail) ; - List files = crdnFiles.get(crdn.string("CRDN_ID")); + List files = crdnFiles.get(dtl.string("CRDN_ID")); List inputs = isEmpty(files) ? Collections.emptyList() : files.stream() .map(FileInfo::getInputStream) .toList(); for (int i = 0; i < Math.min(4, inputs.size()); ++i) { - crdn.set("VLTN_IMG" + i, inputs.get(i)); + dtl.set("VLTN_IMG" + i, inputs.get(i)); } return inputs.stream(); }) .toList(); - String jasper = switch (printOption.getPaperSeCd()) { - case "01" -> "/prenotice-a4.jasper"; - case "02" -> "/prenotice-letter.jasper"; - default -> throw new IllegalArgumentException("paperSeCd: " + printOption.getPaperSeCd()); - }; return new ModelAndView("jasperView") - .addObject("jasper", jasper) + .addObject("jasper", "/prenotice-a4.jasper") .addObject("dataMap", dtlList) .addObject("filename", "prenotice.pdf") .addObject("closables", inputStreams); @@ -197,18 +192,31 @@ public class JasperController extends AbstractController { @RequestMapping(name="고지서 미리보기", value="/notice.do") public ModelAndView previewNotice(SndbQuery req, FimsPrintOption printOption) { - List crdnList = sndngDtlService.getDetailList(List.of(req.getSndngId())); //getCrdnList(req); - setBankAccounts(crdnList); + List dtlList = sndngDtlService.getDetailList(List.of(req.getSndngId())); //getCrdnList(req); + setBankAccounts(dtlList); - String today = dateFormats.format("yyyyMMdd", System.currentTimeMillis()); + String today = dateFormats.format("yyyyMMdd", System.currentTimeMillis()), + year = today.substring(0, 4), + month = today.substring(4, 6), + day = today.substring(6); FimsUser user = (FimsUser)currentUser().getUser(); + String userName = user.getName(), + userPhoneNo = user.getPhoneNo(), + userEmail = user.getEmailAddress(); + dtlList.forEach(dtl -> + dtl.set("CRDN_YMD_TM", DataFormat.yyyy_mm_dd(dtl.get("CRDN_YMD")) + " " + DataFormat.hh_mm_ss(dtl.get("CRDN_TM"))) + .set("DUDT_YMD", DataFormat.yyyy_mm_dd(dtl.get("DUDT_YMD"))) + .set("DUDT_AFTR_YMD", DataFormat.yyyy_mm_dd(dtl.get("DUDT_AFTR_YMD"))) + .set("issueYear", year).set("issueMonth", month).set("issueDay", day) + .set("managerName", userName).set("managerPhoneNo", userPhoneNo).set("managerEmail", userEmail) + ); DataObject params = new DataObject() - .set("thisYear", today.substring(0, 4)) - .set("thisMonth", today.substring(4, 6)) - .set("thisDay", today.substring(6)) - .set("managerName", user.getName()) - .set("managerPhoneNo", user.getPhoneNo()) - .set("managerEmail", user.getEmailAddress()); + .set("thisYear", year) + .set("thisMonth", month) + .set("thisDay", day) + .set("managerName", userName) + .set("managerPhoneNo", userPhoneNo) + .set("managerEmail", userEmail); String jasper = switch (printOption.getPaperSeCd()) { case "01" -> "/notice-a4.jasper"; @@ -218,7 +226,7 @@ public class JasperController extends AbstractController { return new ModelAndView("jasperView") .addObject("jasper", jasper) .addObject("params", params) - .addObject("dataMap", crdnList) + .addObject("dataMap", dtlList) .addObject("filename", "prenotice.pdf"); } } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp index 7ece04c..ac41660 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp @@ -44,6 +44,10 @@ +
+ + +
@@ -59,9 +63,7 @@ - + @@ -143,15 +145,15 @@ /************************************************************************** * Global Variable **************************************************************************/ - pageObject["${pageName}"] = newDoctxFinder("${pageName}"); +// pageObject["${pageName}"] = newDoctxFinder("${pageName}"); /************************************************************************** * script 진입 **************************************************************************/ $(document).ready(function() { // pageObject - let $P = pageObject["${pageName}"]; - + let $P = pageObject["${pageName}"] = newDoctxFinder("${pageName}"); + // URL $P.prefixUrl = "${prefixUrl}"; // datasetControl @@ -160,6 +162,10 @@ $P.callPurpose = "${callPurpose}"; // main 의 검색 조건을 그대로 유지 $P.mainQuery = ${mainQuery}; + let divKb = $P.ctrl.find('[name="divKb"]'); + divKb.innerHTML = ${EGP002} + .map(row => ''.replace(/{code}/gi, row.code).replace(/{value}/gi, row.value)) + .join("\n"); /************************************************************************** * DataTables 이벤트 @@ -237,10 +243,10 @@ // 검색조건과 저장 파라미터 객체를 합친다. let params = $.extend({}, $P.ctrl.query, formFields); - params.divKb = "000"; // 취급 구분 - 일반 + params.divKb = $P.$findn("divKb").val(); // 취급 구분 - 일반 params.sndngRegSeCd = "01"; // 발송 등록 구분 코드(SNDNG_REG_SE_CD) - 01: 일괄 params.vltnCd = items[0].data.VLTN_CD; - params.rsndYn = "N"; // 재발송 여부 + params.rsndYn = $P.mainQuery.rsndYn; // 재발송 여부 params.delYn = "N"; // 삭제 여부 $P.ctrl.save(params); @@ -317,6 +323,8 @@ // 3. 보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); + + divKb.value = "000"; // 일반 }); //# sourceURL=sndb01020-info.jsp \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp index 6d382a7..afde3fd 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp @@ -44,6 +44,10 @@ +
+ + +
@@ -69,7 +73,7 @@
-
+
@@ -172,6 +176,10 @@ $P.callPurpose = "${callPurpose}"; // main 의 검색 조건을 그대로 유지 $P.mainQuery = ${mainQuery}; + let divKb = $P.ctrl.find('[name="divKb"]'); + divKb.innerHTML = ${EGP002} + .map(row => ''.replace(/{code}/gi, row.code).replace(/{value}/gi, row.value)) + .join("\n"); /************************************************************************** * DataTables 이벤트 @@ -226,8 +234,8 @@ // validate 확인 if (!AppSupport.customValidate($P.$findn("frmEdit").find("input,select,textarea"))) return; - let items = $P.ctrl.getDataset("item"); - let invalid = items + let items = $P.ctrl.getDataset("item"), + invalid = items .filter(item => isEmpty(item.data.ADDR) || <%-- isEmpty(item.data.DTL_ADDR) || --%> @@ -240,7 +248,6 @@ onOK: () => {} }); } - dialog.alert({ content: "현재 " + $P.ctrl.prefixName + " 정보를 저장하시겠습니까?" , init: () => { AppSupport.setDialogZindex(); } @@ -249,10 +256,10 @@ // 검색조건과 저장 파라미터 객체를 합친다. let params = $.extend({}, $P.ctrl.query, formFields); - params.divKb = "001"; // 취급 구분 - 등기 + params.divKb = $P.$findn("divKb").val(); params.sndngRegSeCd = "01"; // 발송 등록 구분 코드(SNDNG_REG_SE_CD) - 01: 일괄 params.vltnCd = items[0].data.VLTN_CD; - params.rsndYn = "N"; // 재발송 여부 + params.rsndYn = $P.mainQuery.rsndYn; // 재발송 여부 params.delYn = "N"; // 삭제 여부 $P.ctrl.save(params); @@ -333,6 +340,7 @@ // 3. 보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); + divKb.value = "Y" != $P.mainQuery.rsndYn ? "001" : "000"; // 등기 }); //# sourceURL=sndb01060-info.jsp \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp index 9dcc80e..69272c4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp @@ -372,55 +372,7 @@ // validate 확인 if (!AppSupport.customValidate($P.$findn("frmEdit").find("input,select,textarea"))) return; - let submitParam = new FimsFormFields($P.selectorn("frmEdit")).get(); // formFields - let url = ""; - let fileTypeName = ""; - - if (fileType == "pdf") { -// url = wctx.url($P.prefixUrl + "/080/makeAdvntcePdf.do"); - url = wctx.url("/preview/prenotice.do"); - fileTypeName = "PDF 파일"; - } else if (fileType == "outsourcing") { - url = wctx.url($P.prefixUrl + "/080/makeAdvntceOutsourcing.do"); - fileTypeName = "외주 요청 파일"; - } - - let inBrowser = false; - if (fileType == "pdf") { - submitParam.paperSeCd = paper; - inBrowser = true; - } - - if (inBrowser) { - var parameter = toQuery(submitParam); - var filenameInHeader = ""; - - fetch(url + "?" + parameter) - .then((response) => { - var header = response.headers.get('Content-Disposition'); - if(!header){ - response.json().then((responseJson)=>{ - dialog.alert({ - content: fileTypeName+" 생성 중 오류가 발생하였습니다." - +"
" - +responseJson.description, - init: () => { AppSupport.setDialogZindex(); } - }); - }); - new Error(""); - } - var parts = header.split(';'); - filenameInHeader = decodeURIComponent(parts[1].split('=')[1]); - return response.blob(); - }) - .then((blob) => { - AppSupport.openPDF(blob, filenameInHeader); - }) - .catch(()=>{}); - } else { - var parameter = toQuery(submitParam); - document.location.href = url + "?" + parameter; - } + woopyonMoa.preview("prenotice", new FimsFormFields($P.selectorn("frmEdit")).get().sndngId); } $P.downloadPrenotice = () => woopyonMoa.downloadRequest(new FimsFormFields($P.selectorn("frmEdit")).get()); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp index 00e2126..95a0603 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp @@ -122,6 +122,10 @@ +
+ + +
@@ -186,6 +190,11 @@ $P.control.defaultFetchSize = FETCH_XS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 $P.control.query = { pageNum : 1, fetchSize : $P.control.defaultFetchSize }; $P.control.beforeCurrent = null; + $P.mainQuery = ${mainQuery}; + let divKb = $P.control.find('[name="divKb"]'); + divKb.innerHTML = ${EGP002} + .map(row => ''.replace(/{code}/gi, row.code).replace(/{value}/gi, row.value)) + .join("\n"); /************************************************************************** @@ -193,12 +202,28 @@ **************************************************************************/ // 저장 callback $P.control.onSave = (resp) => { - let dialogTitle = $("#" + $P.control.prefix + "Dialog--${openerPageName}").find("h5.modal-title").html(); - let showMessage = resp.rtnMsg.replace(/[S]|[F]/g, dialogTitle); + let msg = resp.rtnMsg.replace(/\[S\]|\[F\]/g, ""); - // 메시지 출력 + if (!resp.saved) + return dialog.alert({ + content: msg + , onOK: () => { } + }); + + let sndng = resp.sndng, + resend = "Y" == sndng.rsndYn; + if (!resend) + return dialog.alert(msg); + + woopyonMoa.preview("notice", sndng.sndngId); + woopyonMoa.downloadRequest({ + sggCd: MY_INFO.info.sggCd, + taskSeCd: currentTask(), + sndngId: sndng.sndngId + }); +<%-- dialog.alert({ - content: showMessage + content: msg , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { } }); @@ -206,6 +231,7 @@ if (resp.saved) { dialog.close($P.control.prefix + "Dialog--${openerPageName}"); } +--%> } // 저장 @@ -305,7 +331,7 @@ // 검색조건과 저장 파라미터 객체를 합친다. let params = $.extend({}, $P.formEditFields.get(), $P.formFields.get()); params.sndngRegSeCd = "01"; // 발송 등록 구분 코드(SNDNG_REG_SE_CD) - 01: 일괄 - params.rsndYn = "N"; // 재발송 여부 + params.rsndYn = $P.mainQuery.rsndYn; // 재발송 여부 params.delYn = "N"; // 삭제 여부 $P.control.save(params); @@ -423,6 +449,7 @@ // 3. 보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); + divKb.value = "Y" != $P.mainQuery.rsndYn ? "001" : "000"; // 등기 }); - - +//# sourceURL=sndb01100-info.jsp + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp index 7b01e2d..1d6fed4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp @@ -160,6 +160,9 @@ + @@ -192,8 +195,10 @@ +<%-- +--%> @@ -226,8 +231,10 @@ +<%-- +--%> @@ -254,22 +261,22 @@
배달일자 배달시간 미배달사유수령인 수령인관계발송구분 발송일자 과태료금액{DLVR_YMD} {DLVR_TM} {UNDLVR_RSN_NM}{ACTL_RCPN_NM} {RCPN_REL_NM}{SNDNG_SE_NM} {SNDNG_YMD} {FFNLG_AMT}
@@ -287,6 +294,7 @@