From 1c9dc70549f7876b221026776b1243edcf9d93b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 20 Feb 2023 13:17:08 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=20=EC=9D=B8=EC=87=84=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/fpiMgt/affair/AffairController.java | 46 +++-- src/main/resources/static/css/print.css | 52 ++++++ .../igActivities/fpiMgt/affair/affairMgt.js | 2 +- .../fpiMgt/affair/affairViewModal.html | 2 +- .../resources/templates/print/affair.html | 166 ++++++++++++++++++ 5 files changed, 252 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/static/css/print.css create mode 100644 src/main/resources/templates/print/affair.html diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java index a1caf26f..6fca1f44 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java @@ -156,19 +156,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 public ModelAndView affairViewModal(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairViewModal"); affairBoard = affairService.selectAffairBoard(affairBoard.getAffairKey()); - for(AffairRating rating: affairBoard.getRateList()){ - if(rating.getRatingOrgan().equals(loginUser.getOgCd())){ - affairBoard.setAffairStatus(rating.getAffairStatus()); - } - } - if(Utils.isEmpty(affairBoard.getAffairStatus())){ - for(AffairRating rating: affairBoard.getRateList()){ - if(rating.getOrganUp()==null || !rating.getOrganUp().equals("T")){ - affairBoard.setAffairStatus(rating.getAffairStatus()); - break; - } - } - } + affairBoard.setAffairStatus(getAffairRating(affairBoard, loginUser.getOgCd()).getAffairStatus());; + mav.addObject("affair", affairBoard); mav.addObject("userSeq",loginUser.getUserSeq()); mav.addObject("userOrgan", loginUser.getOgCd()); @@ -198,7 +187,15 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 public Integer modifyAffairRating(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){ return affairService.updateAffairRating(loginUser, affairBoard.getRateList()); } - + @GetMapping("/print") + public ModelAndView printAffair(AffairBoard affairBoard){ + ModelAndView mav = new ModelAndView("print/affair"); + affairBoard = affairService.selectAffairBoard(affairBoard.getAffairKey()); + mav.addObject("affair", affairBoard); + mav.addObject("affairRating", getAffairRating(affairBoard, affairBoard.getWrtOrgan())); + return mav; + } + @GetMapping("/statistics") public ModelAndView statistics(@AuthenticationPrincipal UserInfo loginUser, TypeStatistics typeStatistics){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairStatistics"); @@ -297,5 +294,26 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 return typeList; } + + private AffairRating getAffairRating(AffairBoard affairBoard, String ogCd){ + AffairRating affairRating = null; + for(AffairRating rating: affairBoard.getRateList()){ + if(rating.getRatingOrgan().equals(ogCd)){ + affairRating = rating; + //affairBoard.setAffairStatus(rating.getAffairStatus()); + break; + } + } + if(affairRating==null){ + for(AffairRating rating: affairBoard.getRateList()){ + if(rating.getOrganUp()==null || !rating.getOrganUp().equals("T")){ + affairRating = rating; + //affairBoard.setAffairStatus(rating.getAffairStatus()); + break; + } + } + } + return affairRating; + } } diff --git a/src/main/resources/static/css/print.css b/src/main/resources/static/css/print.css new file mode 100644 index 00000000..efaf9fb2 --- /dev/null +++ b/src/main/resources/static/css/print.css @@ -0,0 +1,52 @@ +.table > :not(caption) > * > *{ + padding: 0; +} +p{ + margin-bottom: 0; +} + +body { + width: 100%; + height: 100%; + margin: 0; + padding: 0; + background-color: #FAFAFA; + font: 11pt "Tahoma"; +} +* { + box-sizing: border-box; + -moz-box-sizing: border-box; +} +.page { + width: 210mm; + min-height: 297mm; + padding: 10mm; + margin: 10mm auto; + background: white; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.1); +} +.subpage { + padding: 10mm; + height: 277mm; +} + +@page { + size: A4; + margin: 0; +} +@media print { + html, body { + width: 210mm; + height: 297mm; + } + .page { + margin: 0; + border: initial; + border-radius: initial; + width: initial; + min-height: initial; + box-shadow: initial; + background: initial; + page-break-after: always; + } +} \ No newline at end of file diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js index 377ea5a8..0f9e307b 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js @@ -226,7 +226,7 @@ $(document).on('click', '#fileDownBtn', function (){ }) $(document).on('click', '#printBtn', function (){ - /*window.open("http://118.219.150.34:50570/ClipReport5/report.jsp")*/ + window.open("http://localhost:8080/affair/print?affairKey="+$(this).attr("data-affairkey")); }) function getAffairViewModal(affairKey){ diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index 87690987..66162860 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -333,7 +333,7 @@
- + diff --git a/src/main/resources/templates/print/affair.html b/src/main/resources/templates/print/affair.html new file mode 100644 index 00000000..d8273aa7 --- /dev/null +++ b/src/main/resources/templates/print/affair.html @@ -0,0 +1,166 @@ + + + + + 견문인쇄 + + + + + + +
+
+
+ + + + + + + +

견문보고서

+ + + + + + + + + + + + + + + + + + + + + + + + + +
수신결재계장과장
참조
발신
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
보고자분야1분야2분야3분야4평가상보
소속계급성명 + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + +
비고
검토의견
제목
내용
+ + + + + + + + + + + + + + + + + + +
첨부파일이 없습니다.
+
+
+
+ + \ No newline at end of file