From 5f05d5663c6d0c4899974b56ed23e8210ce09299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Thu, 23 Mar 2023 10:30:00 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0=EA=B2=AC?=
 =?UTF-8?q?=EB=AC=B8=EA=B4=80=EB=A6=AC=20>=20=EC=B2=AD=EC=82=B0=EB=B3=B4?=
 =?UTF-8?q?=EA=B3=A0=EC=84=9C=20=EB=AC=B6=EC=9D=8C=EC=9D=B8=EC=87=84=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fpiMgt/affairResult/ResultController.java |   5 +-
 .../affairResult/model/ResultToPlan.java      |   2 +-
 .../affairResult/service/ResultService.java   |   1 +
 .../fpiMgt/{print.js => fpiPrint.js}          | 113 +++++++++---------
 .../igActivities/fpiMgt/affair/affairMgt.html |   2 +-
 .../fpiMgt/affair/affairViewModal.html        |   2 +-
 .../fpiMgt/affairPlan/planMgt.html            |   2 +-
 .../fpiMgt/affairPlan/planViewModal.html      |   2 +-
 .../fpiMgt/affairResult/resultMgt.html        |   2 +-
 .../fpiMgt/affairResult/resultViewModal.html  |   4 +-
 10 files changed, 72 insertions(+), 63 deletions(-)
 rename src/main/resources/static/js/igActivities/fpiMgt/{print.js => fpiPrint.js} (64%)

diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java
index 6bf3e437..45901c27 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java
+++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java
@@ -286,7 +286,10 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관
     }
     bundleMap.put("planBoard", planBoardList);
     bundleMap.put("affairBoard", affairBoardList);
-    bundleMap.put("resultBoard", resultService.getPrintTypeResultBoard(resultBoard, codeMap));
+    resultBoard = resultService.getPrintTypeResultBoard(resultBoard, codeMap);
+    List<ResultBoard> resultBoardList = new ArrayList<>();
+    resultBoardList.add(resultBoard);
+    bundleMap.put("resultBoard", resultBoardList);
     return bundleMap;
   }
 
diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java
index 9cb888b3..50f87c98 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java
+++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java
@@ -13,7 +13,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @DynamicInsert
 @DynamicUpdate
-@Table(name = "result_info")
+@Table(name = "result_to_plan")
 @IdClass(ResultToPlan.ResultToPlanId.class)
 public class ResultToPlan {
   @Id
diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java
index 94c11b8c..f7f367f1 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java
+++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java
@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
diff --git a/src/main/resources/static/js/igActivities/fpiMgt/print.js b/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js
similarity index 64%
rename from src/main/resources/static/js/igActivities/fpiMgt/print.js
rename to src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js
index eb0c0024..285511d3 100644
--- a/src/main/resources/static/js/igActivities/fpiMgt/print.js
+++ b/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js
@@ -1,49 +1,11 @@
-$(document).on('click', '#printBtn', function (){
+$(document).on('click', '#planPrintBtn', function (){
   $.ajax({
     url: '/affairPlan/planBoardJson',
     type: 'GET',
     data: {planKey: $(this).attr('data-plankey')},
     dataType:"json",
     success: function(data){
-      const plan = {};
-      plan.contentTitle = data.contentTitle;
-      plan.planDt = data.planDt;
-      plan.wrtOrgan = data.wrtOrgan;
-      plan.wrtPart = data.wrtPart;
-      plan.wrtUserGrd = data.wrtUserGrd;
-      plan.wrtUserNm = data.wrtUserNm;
-      for(let i=0; i<data.apprvList.length; i++){
-        const apprv = data.apprvList[i];
-        switch (apprv.state) {
-          case "DST004":
-            plan.sectionApprv = apprv.userNm
-            break;
-          case "DST006":
-            plan.headApprv = apprv.userNm
-            break;
-        }
-      }
-      if(plan.sectionApprv === plan.headApprv){
-        plan.sectionApprv = "전결"
-      }
-      const planInfoSummery = [];
-      const planInfoDetail = [];
-      for(let i=0; i<data.mainInfoList.length; i++){
-        const info = data.mainInfoList[i];
-        if(info.planType === "S"){
-          planInfoSummery.push({planInfo: info.planInfo})
-        }else if(info.planType === "D"){
-          planInfoDetail.push({planInfo: info.planInfo})
-        }
-      }
-      plan.planInfoSummery = planInfoSummery;
-      plan.planInfoDetail = planInfoDetail;
-      const fileList = [];
-      for(let i=0; i<data.fileList.length; i++){
-        fileList.push({origNm: data.fileList[i].origNm+"."+data.fileList[i].fileExtn});
-      }
-      plan.fileList = fileList;
-
+      const plan = makePlanPrintData(data);
       var url = $("#printUrl").attr("data-printurl")+"/singlePrint.jsp";
       var title = "계획 보고서 인쇄";
       var status = "width=900px,height=800px,scrollbars=yes";
@@ -63,7 +25,7 @@ $(document).on('click', '#printBtn', function (){
 })
 
 
-$(document).on('click', '#printBtn', function (){
+$(document).on('click', '#affairPrintBtn', function (){
   // window.open(location.origin+"/affair/print?affairKey="+$(this).attr("data-affairkey"));
   $.ajax({
     url: '/affair/affairBoardJson',
@@ -89,18 +51,14 @@ $(document).on('click', '#printBtn', function (){
   });
 })
 
-$(document).on('click', '#printBtn', function (){
+$(document).on('click', '#resultPrintBtn', function (){
   $.ajax({
     url: '/affairResult/resultBoardJson',
     type: 'GET',
     data: {resultKey: $(this).attr('data-resultkey')},
     dataType:"json",
     success: function(data){
-      data.planPrice = priceNumberToKorean(data.planPrice);
-      data.usePrice = priceNumberToKorean(data.usePrice);
-      for(let i=0; i<data.clearInfoList.length; i++){
-        data.clearInfoList[i].price = "￦ "+data.clearInfoList[i].price.toLocaleString('ko-KR')
-      }
+      data = makeResultPrintData(data);
       var url = $("#printUrl").attr("data-printurl")+"/singlePrint.jsp";
       var title = "청산 보고서 인쇄";
       var status = "width=900px,height=800px,scrollbars=yes";
@@ -119,18 +77,17 @@ $(document).on('click', '#printBtn', function (){
   });
 })
 
-$(document).on('click', '#printBundleBtn', function (){
+$(document).on('click', '#bundlePrintBtn', function (){
   $.ajax({
     url: '/affairResult/resultBundleJson',
     type: 'GET',
     data: {resultKey: $(this).attr('data-resultkey')},
     dataType:"json",
     success: function(data){
-      /*data.planPrice = priceNumberToKorean(data.planPrice);
-      data.usePrice = priceNumberToKorean(data.usePrice);
-      for(let i=0; i<data.clearInfoList.length; i++){
-        data.clearInfoList[i].price = "￦ "+data.clearInfoList[i].price.toLocaleString('ko-KR')
-      }*/
+      for(let i=0; i<data.planBoard.length; i++){
+        data.planBoard[i] = makePlanPrintData(data.planBoard[i]);
+      }
+      data.resultBoard[0] = makeResultPrintData(data.resultBoard[0]);
       var url = $("#printUrl").attr("data-printurl")+"/singlePrint.jsp";
       var title = "청산 보고서 인쇄";
       var status = "width=900px,height=800px,scrollbars=yes";
@@ -148,7 +105,55 @@ $(document).on('click', '#printBundleBtn', function (){
     }
   });
 })
-
+function makePlanPrintData(data){
+  const plan = {};
+  plan.contentTitle = data.contentTitle;
+  plan.planDt = data.planDt;
+  plan.wrtOrgan = data.wrtOrgan;
+  plan.wrtPart = data.wrtPart;
+  plan.wrtUserGrd = data.wrtUserGrd;
+  plan.wrtUserNm = data.wrtUserNm;
+  for(let i=0; i<data.apprvList.length; i++){
+    const apprv = data.apprvList[i];
+    switch (apprv.state) {
+      case "DST004":
+        plan.sectionApprv = apprv.userNm
+        break;
+      case "DST006":
+        plan.headApprv = apprv.userNm
+        break;
+    }
+  }
+  if(plan.sectionApprv === plan.headApprv){
+    plan.sectionApprv = "전결"
+  }
+  const planInfoSummery = [];
+  const planInfoDetail = [];
+  for(let i=0; i<data.mainInfoList.length; i++){
+    const info = data.mainInfoList[i];
+    if(info.planType === "S"){
+      planInfoSummery.push({planInfo: info.planInfo})
+    }else if(info.planType === "D"){
+      planInfoDetail.push({planInfo: info.planInfo})
+    }
+  }
+  plan.planInfoSummery = planInfoSummery;
+  plan.planInfoDetail = planInfoDetail;
+  const fileList = [];
+  for(let i=0; i<data.fileList.length; i++){
+    fileList.push({origNm: data.fileList[i].origNm+"."+data.fileList[i].fileExtn});
+  }
+  plan.fileList = fileList;
+  return plan;
+}
+function makeResultPrintData(resultBoard){
+  resultBoard.planPrice = priceNumberToKorean(resultBoard.planPrice);
+  resultBoard.usePrice = priceNumberToKorean(resultBoard.usePrice);
+  for(let i=0; i<resultBoard.clearInfoList.length; i++){
+    resultBoard.clearInfoList[i].price = "￦ "+resultBoard.clearInfoList[i].price.toLocaleString('ko-KR')
+  }
+  return resultBoard;
+}
 function priceNumberToKorean(price){
   const koreanNumber = ['', '일','이','삼','사','오','육','칠','팔','구'];
   const tenThousandUnit = ['', '만', '억', '조'];
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html
index 03c63d57..7818d517 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html
@@ -4,7 +4,7 @@
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
   <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/affairMgt.js}"></script>
-  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/print.js}"></script>
+  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/fpiPrint.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
index 7876ed22..8a2acd26 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
@@ -335,7 +335,7 @@
 <th:block th:if="${modalType ne 'viewOnly'}">
   <div class="modal-footer bg-light">
     <th:block th:if="${affair.affairStatus eq 'DST006'}">
-      <button type="button" class="btn btn-secondary" id="printBtn" th:data-affairkey="${affair.affairKey}">인쇄</button>
+      <button type="button" class="btn btn-secondary" id="affairPrintBtn" th:data-affairkey="${affair.affairKey}">인쇄</button>
     </th:block>
     <th:block th:if="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'}">
       <!--본청 관리자 상시 수정 허용-->
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html
index 9c22b7b1..b7ecce99 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html
@@ -4,7 +4,7 @@
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
   <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/planMgt.js}"></script>
-  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/print.js}"></script>
+  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/fpiPrint.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html
index f50dfa47..181348dc 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html
@@ -166,7 +166,7 @@
 <th:block th:if="${modalType ne 'viewOnly'}">
 <div class="modal-footer bg-light">
   <th:block th:if="${plan.planState eq 'DST006'}">
-    <button type="button" class="btn btn-secondary" id="printBtn" th:data-plankey="${plan.planKey}">인쇄</button>
+    <button type="button" class="btn btn-secondary" id="planPrintBtn" th:data-plankey="${plan.planKey}">인쇄</button>
   </th:block>
   <th:block th:unless="${plan.planState eq 'DST004' or plan.planState eq 'DST006'}"><!--승인 상태일때는 수정 불가-->
     <th:block th:if="${userSeq eq plan.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
index f94c3d88..ec4bbd97 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
@@ -4,7 +4,7 @@
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
   <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/resultMgt.js}"></script>
-  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/print.js}"></script>
+  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/fpiPrint.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
index 1f307b45..4a1d6219 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
@@ -298,8 +298,8 @@
 </div>
 <div class="modal-footer bg-light">
   <th:block th:if="${result.resultState eq 'DST006'}">
-    <button type="button" class="btn btn-secondary" id="printBundleBtn" th:data-resultkey="${result.resultKey}">묶음인쇄</button>
-    <button type="button" class="btn btn-secondary" id="printBtn" th:data-resultkey="${result.resultKey}">개별인쇄</button>
+    <button type="button" class="btn btn-secondary" id="bundlePrintBtn" th:data-resultkey="${result.resultKey}">묶음인쇄</button>
+    <button type="button" class="btn btn-secondary" id="resultPrintBtn" th:data-resultkey="${result.resultKey}">개별인쇄</button>
   </th:block>
   <th:block th:unless="${result.resultState eq 'DST004' or result.resultState eq 'DST006'}"><!--승인 상태일때는 수정 불가-->
     <th:block th:if="${userSeq eq result.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->