diff --git a/src/main/java/cokr/xit/fims/chongno/JasperController.java b/src/main/java/cokr/xit/fims/chongno/JasperController.java index ade9091..f04f6c9 100644 --- a/src/main/java/cokr/xit/fims/chongno/JasperController.java +++ b/src/main/java/cokr/xit/fims/chongno/JasperController.java @@ -101,7 +101,7 @@ public class JasperController extends AbstractController { .set("faxNo", user.getFaxNo()) .set("managerEmail", user.getEmailAddress()); } - + private List getCrdnList(SndbQuery req) { String[] crdnIds = req.getCrdnIds(); if (isEmpty(crdnIds)) { @@ -122,18 +122,12 @@ public class JasperController extends AbstractController { Map> crdnFiles = fileBean.getFilesOf(Crdn.INF_TYPE, crdnIds).stream() .collect(Collectors.groupingBy(row -> row.getInfoKey())); setBankAccounts(dtlList); - + List inputStreams = dtlList.stream() .flatMap(dtl -> { String taxNo = dtl.string("TAX_NO"); 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("managerPhoneNo", userPhoneNo) -// .set("faxNo", faxNo) -// .set("managerEmail", userEmail) .set("napbuYm", isEmpty(taxNo) ? null : taxNo.substring(15, 22)) ; @@ -197,31 +191,17 @@ public class JasperController extends AbstractController { List dtlList = sndngDtlService.getDetailList(List.of(req.getSndngId())); //getCrdnList(req); setBankAccounts(dtlList); - String today = dateFormats.format("yyyyMMdd", System.currentTimeMillis()), - year = today.substring(0, 4), - month = today.substring(4, 6), - day = today.substring(6), - userName = "박재현", - userPhoneNo = "02-2148-1857", - userEmail = "poe307@mail.jongno.go.kr"; - dtlList.forEach(dtl -> { + for (DataObject dtl: dtlList) { String taxNo = dtl.string("TAX_NO"); 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("napbuYm", isEmpty(taxNo) ? null : taxNo.substring(15, 22)) - .set("managerName", userName).set("managerPhoneNo", userPhoneNo).set("managerEmail", userEmail); - }); - - String jasper = switch (printOption.getPaperSeCd()) { - case "01" -> "/notice-a4.jasper"; - case "02" -> "/notice-letter.jasper"; - default -> throw new IllegalArgumentException("paperSeCd: " + printOption.getPaperSeCd()); + .set("napbuYm", isEmpty(taxNo) ? null : taxNo.substring(15, 22)); }; + return new ModelAndView("jasperView") - .addObject("jasper", jasper) + .addObject("jasper", "/notice-a4.jasper") .addObject("params", getParams()) .addObject("dataMap", dtlList) .addObject("filename", "prenotice.pdf"); diff --git a/src/main/resources/intf-conf/xit-sntris.conf b/src/main/resources/intf-conf/xit-sntris.conf index 76bc480..d1f9c35 100644 --- a/src/main/resources/intf-conf/xit-sntris.conf +++ b/src/main/resources/intf-conf/xit-sntris.conf @@ -1,5 +1,5 @@ { - "host": "http://98.33.4.164", + "host": "http://98.33.4.167:8082", /* 운영: http://98.33.4.164 개발: http://98.33.4.167:8082 */ diff --git a/src/main/resources/spring/context-scheduler.xml b/src/main/resources/spring/context-scheduler.xml index b70fb01..3987fe6 100644 --- a/src/main/resources/spring/context-scheduler.xml +++ b/src/main/resources/spring/context-scheduler.xml @@ -15,7 +15,7 @@ - +