From c79cd58c4b38221dd67b6f86449dc8611e25b273 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: Mon, 3 Jul 2023 18:14:36 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81=20?=
 =?UTF-8?q?=EA=B2=B0=EA=B3=BC=EB=B3=B4=EA=B3=A0=EC=84=9C=20=EC=9D=B8?=
 =?UTF-8?q?=EC=87=84=20=EA=B8=B0=EB=8A=A5=20=EC=9E=91=EC=97=85=EC=A4=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/MonitoringController.java      |  8 +++
 .../monitoring/monitoringPrint.js             | 55 +++++--------------
 .../monitoring/resultViewModal.html           |  3 +
 3 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java
index ea2cb00d..509843a6 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java
+++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java
@@ -330,4 +330,12 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니
     return md;
   }
 
+  @GetMapping("/resultJson")
+  public MonitoringResult monitoringResultJson(MonitoringResult mr, HttpSession session){
+    Map<String, List<CodeMgt>> codeMap = (Map<String, List<CodeMgt>>) session.getAttribute("commonCode");
+    mr = monitoringService.selectResult(mr.getMrKey());
+//    md = monitoringService.getPrintTypeDesignation(md, codeMap);
+    return mr;
+  }
+
 }
diff --git a/src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js b/src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js
index 74699249..94e00773 100644
--- a/src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js
+++ b/src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js
@@ -24,23 +24,23 @@ $(document).on('click', '#designationPrintBtn', function (){
   });
 })
 
-$(document).on('click', '#analyzePrintBtn', function (){
+$(document).on('click', '#resultPrintBtn', function (){
   $.ajax({
-    url: '/intelligenceNetwork/intelligenceAnalyzeJson',
+    url: '/monitoring/resultJson',
     type: 'GET',
-    data: {iaKey: $(this).attr('data-iakey')},
+    data: {mrKey: $(this).attr('data-mrkey')},
     dataType:"json",
     success: function(data){
-      const analyze = makeAnalyzePrintData(data);
+      const monitoringResult = makeResultPrintData(data);
       var url = $("#printUrl").attr("data-printurl")+"/singlePrint.jsp";
-      var title = "분석평가서 인쇄";
+      var title = "청산보고서 인쇄";
       var status = "width=900px,height=800px,scrollbars=yes";
       window.open("", title, status);
       const form = $("#printForm")[0];
       form.target = title;
       form.action = url;
-      form.crfName.value = "intelligenceAnalyze";
-      form.json.value = JSON.stringify(analyze);
+      form.crfName.value = "monitoringResult";
+      form.json.value = JSON.stringify(monitoringResult);
       form.method = "post";
       form.submit();
     },
@@ -75,37 +75,12 @@ function makeDesignationPrintData(data){
   return md;
 }
 
-function makeAnalyzePrintData(data){
-  const analyze = {};
-  analyze.iaSdate = data.iaSdate;
-  analyze.iaEdate = data.iaEdate;
-  analyze.fiCnt = data.fiCnt;
-  analyze.faCnt = data.faCnt;
-  analyze.workCnt = data.workCnt;
-  analyze.arrestCnt = data.arrestCnt;
-  analyze.totalCnt = data.totalCnt
-  analyze.specialCnt = data.specialCnt;
-  analyze.middleCnt = data.middleCnt;
-  analyze.tongCnt = data.tongCnt;
-  analyze.joCnt = data.joCnt;
-  analyze.muCnt = data.muCnt;
-  analyze.iaTotal = data.iaTotal;
-  analyze.foreignAffairs = data.foreignAffairs;
-  analyze.work = data.work;
-  analyze.arrestOffenders = data.arrestOffenders;
-  analyze.analysisEvaluation = data.analysisEvaluation;
-  analyze.measures = data.measures;
-
-  analyze.wrtDt = data.wrtDt.replace("T", " ").substring(0, 16);
-  analyze.wrtPart = data.wrtOrgan+" "+data.wrtPart;
-  analyze.wrtUserGrd = data.wrtUserGrd;
-  analyze.wrtUserNm = data.wrtUserNm;
-
-  const apprv = data.apprvList[0];
-  analyze.opinion = apprv.opinion;
-  analyze.instruction = apprv.instruction;
-  analyze.headPart = apprv.ogCd+" "+apprv.ofcCd;
-  analyze.headGrd = apprv.userGrd;
-  analyze.headNm = apprv.userNm;
-  return analyze;
+function makeResultPrintData(data){
+  const result = {
+    wrtDt: data.wrtDt.replace("T", " ").substring(0, 16),
+    wrtPart: data.wrtOrgan+" "+data.wrtPart,
+    wrtUserGrd: data.wrtUserGrd,
+    wrtUserNm: data.wrtUserNm
+  };
+  return result;
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/igActivities/monitoring/resultViewModal.html b/src/main/resources/templates/igActivities/monitoring/resultViewModal.html
index 3ecaafc4..8bb6532e 100644
--- a/src/main/resources/templates/igActivities/monitoring/resultViewModal.html
+++ b/src/main/resources/templates/igActivities/monitoring/resultViewModal.html
@@ -283,6 +283,9 @@
     </th:block>
   </div>
   <div class="col-auto">
+    <th:block th:if="${mr.mrState eq 'DST006'}">
+      <button type="button" class="btn btn-secondary" th:data-mrkey="${mr.mrKey}" id="resultPrintBtn">인쇄</button>
+    </th:block>
     <th:block th:unless="${mr.mrState eq 'DST004' or mr.mrState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
       <th:block th:if="${userSeq eq mr.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
         <button type="button" class="btn btn-warning" th:data-mrkey="${mr.mrKey}" id="editBtn">수정</button>