diff --git a/src/main/java/cokr/xit/fims/chongno/JasperController.java b/src/main/java/cokr/xit/fims/chongno/JasperController.java index 98baa43..4519c39 100644 --- a/src/main/java/cokr/xit/fims/chongno/JasperController.java +++ b/src/main/java/cokr/xit/fims/chongno/JasperController.java @@ -129,10 +129,12 @@ public class JasperController extends AbstractController { 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("napbuYm", isEmpty(taxNo) ? null : taxNo.substring(15, 22)) ; List files = crdnFiles.get(dtl.string("CRDN_ID")); @@ -201,13 +203,16 @@ public class JasperController extends AbstractController { userName = "박재현", userPhoneNo = "02-2148-1857", userEmail = "poe307@mail.jongno.go.kr"; - dtlList.forEach(dtl -> + dtlList.forEach(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("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) - ); + .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) diff --git a/src/main/webapp/WEB-INF/report/notice-a4.jasper b/src/main/webapp/WEB-INF/report/notice-a4.jasper index 2caa72d..e8b16d3 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 5e54edd..54cc820 100644 --- a/src/main/webapp/WEB-INF/report/notice-a4.jrxml +++ b/src/main/webapp/WEB-INF/report/notice-a4.jrxml @@ -149,6 +149,9 @@ + + + @@ -340,6 +343,12 @@ + + + + + + diff --git a/src/main/webapp/WEB-INF/report/prenotice-a4.jasper b/src/main/webapp/WEB-INF/report/prenotice-a4.jasper index 058eecc..0caceef 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 f1d1354..02eea9e 100644 --- a/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml +++ b/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml @@ -153,6 +153,9 @@ + + + @@ -204,7 +207,7 @@ - + @@ -348,6 +351,9 @@ + + +