diff --git a/src/main/java/cokr/xit/fims/chongno/JasperController.java b/src/main/java/cokr/xit/fims/chongno/JasperController.java index 8819c4b..77b4092 100644 --- a/src/main/java/cokr/xit/fims/chongno/JasperController.java +++ b/src/main/java/cokr/xit/fims/chongno/JasperController.java @@ -7,8 +7,6 @@ import java.util.Map; import java.util.stream.Collectors; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -56,19 +54,20 @@ public class JasperController extends AbstractController { String today = dateFormats.format("yyyyMMdd", System.currentTimeMillis()), year = today.substring(0, 4), month = today.substring(4, 6), - day = today.substring(6), - email = ((FimsUser)currentUser().getUser()).getEmailAddress(); + day = today.substring(6); + FimsUser user = (FimsUser)currentUser().getUser(); + String userName = user.getName(), + userPhoneNo = user.getPhoneNo(), + userEmail = user.getEmailAddress(); List inputStreams = crdnList.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"))) - .set("GOJI_NO", blankIfEmpty(crdn.string("GOJI_NO")).replace("-", "")) .set("issueYear", year).set("issueMonth", month).set("issueDay", day) - .set("managerEmail", email) + .set("managerName", userName).set("managerPhoneNo", userPhoneNo).set("managerEmail", userEmail) ; - String crdnId = crdn.string("CRDN_ID"); - List files = crdnFiles.get(crdnId); + List files = crdnFiles.get(crdn.string("CRDN_ID")); List inputs = isEmpty(files) ? Collections.emptyList() : files.stream() .map(FileInfo::getInputStream) @@ -92,56 +91,4 @@ public class JasperController extends AbstractController { .addObject("filename", "prenotice.pdf") .addObject("closables", inputStreams); } - -// @RequestMapping("/test") - public ModelAndView previewPreNotice(HttpServletRequest hreq, HttpServletResponse hresp) { - DataObject info = new DataObject() - .set("RTPYR_ADDR", "서울특별시 강서구 양천로 400-12") - .set("RTPYR_DTL_ADDR", "더리브골드타워 1101호, 1102호") - .set("RTPYR_NM", "홍길동") - .set("RTPYR_NO", "0101011234567") - .set("RTPYR_ZIP", "07573") - .set("sigunguName", "서울시 종로구") - .set("fineName", "특별관리지역 통행제한 위반") - .set("VHRNO", "12가 3456") - .set("CRDN_PLC", "정독도서관 앞") - .set("VLTN_ARTCL", "특별관리지역 통행제한 위반") - .set("CRDN_YMD_TM", "2025-04-01 12:30:33") - .set("opinionDatelimit", "2025-04-15") - .set("evidenceNo", "12345") - .set("paymentDatelimit", "2025-04-30") - .set("initialAmt", 300_000) - .set("reducedAmt", 300_000) - .set("finalAmt", 300_000) - .set("EPAYNO", "123456789012345678") - .set("bankAccount1", "농협 1234567890") - .set("bankAccount2", "기업은행 2345678901") - .set("bankAccount3", "하나은행 3456789012") - .set("bankAccount4", "국민은행 4567890123") - .set("bankAccount5", "신한은행 5678901234") - .set("VLTN_LAW_NM", "관광진흥법") - .set("receiverName", "서울특별시장") -/* - .set("violationImage1", "03152") - .set("violationImage2", "03152") - .set("violationImage3", "03152") - .set("violationImage4", "03152") -*/ - .set("instDeptCode", "40503900000") - .set("year", "2025") - .set("accountCode", "41") - .set("taxItemCode", "234166") - .set("accountName", "특별관리지역 통행제한 위반 과태료") - .set("noticeNo", "00001600") - .set("gom", "7") - .set("issueYear", "2025") - .set("issueMonth", "04") - .set("issueDay", "03") - .set("managerEmail", "acme@seoul.go.kr"); - - return new ModelAndView("jasperView") - .addObject("jasper", "/prenotice-letter.jasper") - .addObject("dataMap", info) - .addObject("filename", "prenotice.pdf"); - } } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index a5ee653..ea9ba9e 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -49,9 +49,11 @@ +<%-- +--%> diff --git a/src/main/webapp/WEB-INF/report/img/prenotice-1.jpg b/src/main/webapp/WEB-INF/report/img/prenotice-1.jpg new file mode 100644 index 0000000..9258996 Binary files /dev/null and b/src/main/webapp/WEB-INF/report/img/prenotice-1.jpg differ diff --git a/src/main/webapp/WEB-INF/report/prenotice-a4.jasper b/src/main/webapp/WEB-INF/report/prenotice-a4.jasper index 8bee133..88dfc8d 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 8dcb285..f20671a 100644 --- a/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml +++ b/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml @@ -1,5 +1,5 @@ - + @@ -50,11 +50,14 @@ - - + + + + + - + @@ -96,9 +99,6 @@ - - - @@ -123,264 +123,193 @@ + + + + + + - - - - - - - - + + + + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - - - - - - - - - - - - - - + + - - + + - + - + - + - + - + - - - - + - + - + - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + - - + + + - - + + + - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - + - - - - - - - - - - - - - - + + - + - + - - - + + - - - + + - - - + + - - - + + + + + - diff --git a/src/main/webapp/WEB-INF/report/prenotice-letter.jasper b/src/main/webapp/WEB-INF/report/prenotice-letter.jasper index 6a58f1f..2e77d22 100644 Binary files a/src/main/webapp/WEB-INF/report/prenotice-letter.jasper and b/src/main/webapp/WEB-INF/report/prenotice-letter.jasper differ diff --git a/src/main/webapp/WEB-INF/report/prenotice-letter.jrxml b/src/main/webapp/WEB-INF/report/prenotice-letter.jrxml index fbdeedf..c87712d 100644 --- a/src/main/webapp/WEB-INF/report/prenotice-letter.jrxml +++ b/src/main/webapp/WEB-INF/report/prenotice-letter.jrxml @@ -1,15 +1,6 @@ - + - - - - - - - - - @@ -50,11 +41,14 @@ - - + + + + + - + @@ -96,9 +90,6 @@ - - - @@ -123,260 +114,191 @@ + + + + + + - - - - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - - - - - - - - - - - - - - + + - - + + - + - + - + - + - + - - - - + - + - + - - - - - - - - - - - - - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + - - + + + - - + + + - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - + - - - - - - - - - - - - - - + + - + - + - - - + + - - - + + - - - + + - - - + + + + +