diff --git a/deploy/fims-chongno.war b/deploy/fims-chongno.war new file mode 100644 index 0000000..e73f7b7 Binary files /dev/null and b/deploy/fims-chongno.war differ diff --git a/src/main/java/cokr/xit/fims/chongno/JasperController.java b/src/main/java/cokr/xit/fims/chongno/JasperController.java index 4519c39..ade9091 100644 --- a/src/main/java/cokr/xit/fims/chongno/JasperController.java +++ b/src/main/java/cokr/xit/fims/chongno/JasperController.java @@ -81,24 +81,27 @@ public class JasperController extends AbstractController { }) .toList(); + return new ModelAndView("jasperView") + .addObject("jasper", "warning.jasper") + .addObject("params", getParams()) + .addObject("dataMap", result) + .addObject("filename", "warning.pdf") + .addObject("closables", inputStreams); + } + + private DataObject getParams() { String today = dateFormats.format("yyyyMMdd", System.currentTimeMillis()); FimsUser user = (FimsUser)currentUser().getUser(); - DataObject params = new DataObject() + return 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("faxNo", user.getFaxNo()) .set("managerEmail", user.getEmailAddress()); - - return new ModelAndView("jasperView") - .addObject("jasper", "warning.jasper") - .addObject("params", params) - .addObject("dataMap", result) - .addObject("filename", "warning.pdf") - .addObject("closables", inputStreams); } - + private List getCrdnList(SndbQuery req) { String[] crdnIds = req.getCrdnIds(); if (isEmpty(crdnIds)) { @@ -119,21 +122,18 @@ public class JasperController extends AbstractController { Map> crdnFiles = fileBean.getFilesOf(Crdn.INF_TYPE, crdnIds).stream() .collect(Collectors.groupingBy(row -> row.getInfoKey())); 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"; + 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("managerName", userName).set("managerPhoneNo", userPhoneNo).set("managerEmail", userEmail) +// .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)) ; @@ -152,6 +152,7 @@ public class JasperController extends AbstractController { return new ModelAndView("jasperView") .addObject("jasper", "/prenotice-a4.jasper") + .addObject("params", getParams()) .addObject("dataMap", dtlList) .addObject("filename", "prenotice.pdf") .addObject("closables", inputStreams); @@ -213,13 +214,6 @@ public class JasperController extends AbstractController { .set("napbuYm", isEmpty(taxNo) ? null : taxNo.substring(15, 22)) .set("managerName", userName).set("managerPhoneNo", userPhoneNo).set("managerEmail", userEmail); }); - DataObject params = new DataObject() - .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"; @@ -228,7 +222,7 @@ public class JasperController extends AbstractController { }; return new ModelAndView("jasperView") .addObject("jasper", jasper) - .addObject("params", params) + .addObject("params", getParams()) .addObject("dataMap", dtlList) .addObject("filename", "prenotice.pdf"); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 416c3dd..a3c6d9e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -50,7 +50,7 @@ propertyService: - pageUnit: 10 - pageSize: 10 - permitAccess: /intf/**/* - - enforceCrdnTarget: true + - enforceCrdnTarget: false extFileName: - encoding: UTF-8 filename: classpath*:intf-conf/xit-lvis.properties diff --git a/src/main/webapp/WEB-INF/report/notice-a4.jasper b/src/main/webapp/WEB-INF/report/notice-a4.jasper index e8b16d3..c992ce0 100644 Binary files a/src/main/webapp/WEB-INF/report/notice-a4.jasper and b/src/main/webapp/WEB-INF/report/notice-a4.jasper differ diff --git a/src/main/webapp/WEB-INF/report/notice-a4.jrxml b/src/main/webapp/WEB-INF/report/notice-a4.jrxml index 54cc820..b0a5672 100644 --- a/src/main/webapp/WEB-INF/report/notice-a4.jrxml +++ b/src/main/webapp/WEB-INF/report/notice-a4.jrxml @@ -10,6 +10,9 @@ + + + @@ -163,24 +166,18 @@ - + - + - + - + - - - - - - @@ -262,7 +259,7 @@ - + @@ -274,7 +271,7 @@ - + @@ -292,16 +289,10 @@ - - - - - - - + @@ -349,6 +340,20 @@ + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/report/prenotice-a4.jasper b/src/main/webapp/WEB-INF/report/prenotice-a4.jasper index 1942318..13afaf9 100644 Binary files a/src/main/webapp/WEB-INF/report/prenotice-a4.jasper and b/src/main/webapp/WEB-INF/report/prenotice-a4.jasper differ diff --git a/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml b/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml index 276279a..62c39c8 100644 --- a/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml +++ b/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml @@ -13,6 +13,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -138,24 +159,6 @@ - - - - - - - - - - - - - - - - - - @@ -170,25 +173,18 @@ - + - + - + - + - - - - - - - @@ -201,10 +197,10 @@ - + - + @@ -250,16 +246,16 @@ - + - + - + - + @@ -269,26 +265,26 @@ - + - + - + - + - + - + @@ -297,12 +293,14 @@ - + - + + + @@ -310,26 +308,29 @@ - + - + - + - + - + + + + - + - + @@ -337,7 +338,7 @@ - + @@ -346,17 +347,17 @@ - + - + - + @@ -366,6 +367,20 @@ + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/report/warning.jasper b/src/main/webapp/WEB-INF/report/warning.jasper index 138824c..a44242d 100644 Binary files a/src/main/webapp/WEB-INF/report/warning.jasper and b/src/main/webapp/WEB-INF/report/warning.jasper differ diff --git a/src/main/webapp/WEB-INF/report/warning.jrxml b/src/main/webapp/WEB-INF/report/warning.jrxml index 88e7c82..9f0731a 100644 --- a/src/main/webapp/WEB-INF/report/warning.jrxml +++ b/src/main/webapp/WEB-INF/report/warning.jrxml @@ -19,6 +19,9 @@ + + + @@ -131,12 +134,6 @@ - - - - - - @@ -212,6 +209,20 @@ + + + + + + + + + + + + + +