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> codeMap = (Map>) 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 @@
+ + +