From 98298bcb1bea2f4eccdab86db0f0bd7576b38ee8 Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Wed, 3 Sep 2025 15:08:35 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=84=EB=8F=84=EC=9E=A5=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=ED=99=94=EB=A9=B4=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 | 41 ++++++++++------- .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 3 +- .../WEB-INF/jsp/fims/epst/epst02030-main.jsp | 44 ++++++++++++------- .../WEB-INF/jsp/fims/sndb/sndb01040-info.jsp | 11 +++-- .../WEB-INF/jsp/fims/sndb/sndb01080-info.jsp | 9 ++-- .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 4 +- .../webapp/WEB-INF/jsp/include/bottom.jsp | 3 +- 7 files changed, 66 insertions(+), 49 deletions(-) diff --git a/src/main/java/cokr/xit/fims/chongno/JasperController.java b/src/main/java/cokr/xit/fims/chongno/JasperController.java index 15baf82..35b62b1 100644 --- a/src/main/java/cokr/xit/fims/chongno/JasperController.java +++ b/src/main/java/cokr/xit/fims/chongno/JasperController.java @@ -44,24 +44,31 @@ public class JasperController extends AbstractController { @RequestMapping(name="계도장 미리보기", value="/warning.do") public ModelAndView previewWarning(SndbQuery req) { - List crdnList = getCrdnList(req); - crdnList.forEach(row -> { - row.set("CRDN_YMD_TM", DataFormat.yyyy_mm_dd(row.get("CRDN_YMD")) + " " + DataFormat.hh_mm_ss(row.get("CRDN_TM"))); - }); - List crdnIdList = crdnList.stream().map(row -> row.string("CRDN_ID")).toList(); - List crdns = crdnService.getCrackdowns(crdnIdList); - List upds = crdns.stream() - .filter(crdn -> { - return true; - }) - .toList(); - String[] crdnIds = crdnIdList.toArray(new String[crdnList.size()]); - Map> crdnFiles = fileBean.getFilesOf(Crdn.INF_TYPE, crdnIds).stream() + List result = sndngDtlService.getSndngDtlList(req.setFetchSize(0)); + List crdnIdList = result.stream().map(row -> row.string("CRDN_ID")).distinct().toList(); + String[] crdnIDs = crdnIdList.toArray(new String[crdnIdList.size()]); + Map crdns = getCrdnList(new SndbQuery().setCrdnIds(crdnIDs)).stream() + .collect(Collectors.toMap(row -> row.string("CRDN_ID"), row -> row)); + result.forEach(row -> { + String crdnId = row.string("CRDN_ID"); + DataObject crdn = crdns.get(crdnId); + if (crdn == null) return; + + row.set("CRDN_YMD_TM", DataFormat.yyyy_mm_dd(crdn.get("CRDN_YMD")) + " " + DataFormat.hh_mm_ss(crdn.get("CRDN_TM"))) + .set("RTPYR_ADDR", crdn.get("RTPYR_ADDR")) + .set("RTPYR_DTL_ADDR", crdn.get("RTPYR_DTL_ADDR")) + .set("RTPYR_ZIP", crdn.get("RTPYR_ZIP")) + .set("RTPYR_NM", crdn.get("RTPYR_NM")) + .set("RTPYR_NM", crdn.get("RTPYR_NM")) + .set("VLTN_ARTCL", crdn.get("VLTN_ARTCL")) + .set("VLTN_LAW_NM", crdn.get("VLTN_LAW_NM")) + ; + }); + + Map> crdnFiles = fileBean.getFilesOf(Crdn.INF_TYPE, crdnIDs).stream() .collect(Collectors.groupingBy(row -> row.getInfoKey())); - List inputStreams = crdnList.stream() + List inputStreams = result.stream() .flatMap(crdn -> { - crdn.set("CRDN_YMD_TM", DataFormat.yyyy_mm_dd(crdn.get("CRDN_YMD")) + " " + DataFormat.hh_mm_ss(crdn.get("CRDN_TM"))); - List files = crdnFiles.get(crdn.string("CRDN_ID")); List inputs = isEmpty(files) ? Collections.emptyList() : files.stream() @@ -88,7 +95,7 @@ public class JasperController extends AbstractController { return new ModelAndView("jasperView") .addObject("jasper", "warning.jasper") .addObject("params", params) - .addObject("dataMap", crdnList) + .addObject("dataMap", result) .addObject("filename", "warning.pdf") .addObject("closables", inputStreams); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 2047938..d695e43 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -347,7 +347,8 @@ $(document).ready(function(){ $P.$findn("byOutput").val("동적 검색"); $P.$findn("schRgtrNm").prop("readonly", true); // 사용자 이름 - $P.$findn("schCrdnYmdFrom").datepicker('setDate', DateSupport.getAddDay(-365)); + $P.$findn("schCrdnYmdFrom").datepicker('setDate', DateSupport.getAddDay(-1)); +<%-- $P.$findn("schCrdnYmdFrom").datepicker('setDate', DateSupport.getAddDay(-365));--%> $P.$findn("schCrdnYmdTo").datepicker('setDate', TODAY()); ctrl.dataset.setData([]); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp index dc0ccf5..1fa0ffc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp @@ -343,33 +343,43 @@ tabName = $P.$findn("tabMain").find("button.active").text().trim(); // 탭 선택에 따른 우편 처리 상태(POST_PROC_STT) 설정. - if (tabName == "발송대기") { // 발송대기 - $P.ctrl.query.postPrcsSttsCdFrom = "01"; + switch (tabName) { + case "발송대기": + $P.ctrl.query.postPrcsSttsCdFrom = $P.ctrl.query.postPrcsSttsCdTo = "01"; - } else if (tabName == "발송취소") { // 발송취소 - $P.ctrl.query.postPrcsSttsCdFrom = "02"; + break; + case "발송취소": + $P.ctrl.query.postPrcsSttsCdFrom = $P.ctrl.query.postPrcsSttsCdTo = "02"; - } else if (tabName == "전송") { // 전송 - $P.ctrl.query.postPrcsSttsCdFrom = "03"; + break; + case "전송": + $P.ctrl.query.postPrcsSttsCdFrom = $P.ctrl.query.postPrcsSttsCdTo = "03"; - } else if (tabName == "접수") { // 접수 - $P.ctrl.query.postPrcsSttsCdFrom = "05"; + break; + case "접수": + $P.ctrl.query.postPrcsSttsCdFrom = $P.ctrl.query.postPrcsSttsCdTo = "05"; - } else if (tabName == "제작불가") { // 제작불가 + break; + case "제작불가": $P.ctrl.query.postPrcsSttsCdFrom = "21"; $P.ctrl.query.postPrcsSttsCdTo = "79"; - } else if (tabName == "제작완료") { // 제작완료 - $P.ctrl.query.postPrcsSttsCdFrom = "80"; + break; + case "제작완료": + $P.ctrl.query.postPrcsSttsCdFrom = $P.ctrl.query.postPrcsSttsCdTo = "80"; - } else if (tabName == "배달중") { // 배달중 - $P.ctrl.query.postPrcsSttsCdFrom = "90"; + break; + case "배달중": + $P.ctrl.query.postPrcsSttsCdFrom = $P.ctrl.query.postPrcsSttsCdTo = "90"; - } else if (tabName == "배달완료") { // 배달완료 - $P.ctrl.query.postPrcsSttsCdFrom = "95"; + break; + case "배달완료": + $P.ctrl.query.postPrcsSttsCdFrom = $P.ctrl.query.postPrcsSttsCdTo = "95"; - } else { // 전체 + break; + default: $P.ctrl.query.postPrcsSttsCdFrom = "01"; - $P.ctrl.query.postPrcsSttsCdTo = "99"; + $P.ctrl.query.postPrcsSttsCdTo = "99"; + break; } $P.ctrl.load(1); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp index 6afcbb1..8ad773a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp @@ -48,7 +48,8 @@ 등기번호 발송일자 납기일자 - 수취인 + 수취인 + 주소 배달일시 미배달사유 수령인 @@ -70,10 +71,8 @@ {RG_NO} {SNDNG_YMD} {DUDT_YMD} - - {RCPN_NM} - {RCPN_ZIP}, {RCPN_ADDR} {RCPN_DTL_ADDR} - + {RCPN_NM} + {RCPN_ZIP}, {RCPN_ADDR} {RCPN_DTL_ADDR} {DLVR_YMD} {DLVR_TM} {UNDLVR_RSN_NM} {ACTL_RCPN_NM} @@ -211,7 +210,7 @@ fetch(url + "?" + parameter) .then((response) => { var header = response.headers.get('Content-Disposition'); - if(!header){ + if (!header){ response.json().then((responseJson)=>{ dialog.alert({ content: fileTypeName+" 생성 중 오류가 발생하였습니다." 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 7207cda..22481a0 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 @@ -52,7 +52,8 @@ 등기번호 발송일자 발송종료일자 - 수취인 + 수취인 + 주소 배달일시 미배달사유 수령인 @@ -81,10 +82,8 @@ {RG_NO} {SNDNG_YMD} {SNDNG_END_YMD} - - {RCPN_NM} - {RCPN_ZIP}, {RCPN_ADDR}, {RCPN_DTL_ADDR} - + {RCPN_NM} + {RCPN_ZIP}, {RCPN_ADDR} {RCPN_DTL_ADDR} {DLVR_YMD} {DLVR_TM} {UNDLVR_RSN_NM} {ACTL_RCPN_NM} diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp index 2d000dc..815c962 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp @@ -247,10 +247,10 @@
- + - +
diff --git a/src/main/webapp/WEB-INF/jsp/include/bottom.jsp b/src/main/webapp/WEB-INF/jsp/include/bottom.jsp index 1d350e6..d888a12 100644 --- a/src/main/webapp/WEB-INF/jsp/include/bottom.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/bottom.jsp @@ -4,10 +4,11 @@