From e67fdfd50d4ac380399132b68a1891e7df9dfa90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 30 Jun 2023 12:25:56 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=B4=EC=96=91=EC=99=B8=EC=82=AC=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81=20>=20=EC=A7=80=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EA=B3=A0=20=EC=9D=B8=EC=87=84=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitoring/MonitoringController.java | 12 ++ .../monitoring/service/MonitoringService.java | 12 ++ .../monitoring/monitoringPrint.js | 111 ++++++++++++++++++ .../monitoring/designationList.html | 7 ++ .../monitoring/designationViewModal.html | 3 + 5 files changed, 145 insertions(+) create mode 100644 src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js 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 81eb63ff..ea2cb00d 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 @@ -1,6 +1,7 @@ package com.dbnt.faisp.main.fpiMgt.monitoring; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv; @@ -18,8 +19,10 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpSession; import java.time.LocalDateTime; import java.util.List; +import java.util.Map; @RestController @RequiredArgsConstructor @@ -318,4 +321,13 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 monitoringService.deleteMonitoringResult(mr.getMrKey()); } + + @GetMapping("/designationJson") + public MonitoringDesignation monitoringDesignationJson(MonitoringDesignation md, HttpSession session){ + Map> codeMap = (Map>) session.getAttribute("commonCode"); + md = monitoringService.selectDesignation(md.getMdKey()); + md = monitoringService.getPrintTypeDesignation(md, codeMap); + return md; + } + } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java index ffc1970c..64cf02d1 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java @@ -4,6 +4,7 @@ package com.dbnt.faisp.main.fpiMgt.monitoring.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.fpiMgt.affairPlan.mapper.PlanMapper; import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv; import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; @@ -51,6 +52,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.util.List; +import java.util.Map; import java.util.UUID; @Service @@ -347,4 +349,14 @@ public class MonitoringService extends BaseService { public void deleteMonitoringResult(Integer mrKey) { monitoringResultRepository.bulkModifyingByMrKeyToMrState(mrKey, "DST008"); } + + public MonitoringDesignation getPrintTypeDesignation(MonitoringDesignation md, Map> codeMap) { + md.setWrtPart(Utils.searchCodeValue(md.getWrtPart(), codeMap.get(md.getWrtOrgan()))); + md.setWrtOrgan(Utils.searchCodeValue(md.getWrtOrgan(), codeMap.get("OG"))); + md.setWrtUserGrd(Utils.searchCodeValue(md.getWrtUserGrd(), codeMap.get("JT"))); + for(MonitoringDesignationApprv apprv : md.getApprvList()){ + apprv.setUserGrd(Utils.searchCodeValue(apprv.getUserGrd(), codeMap.get("JT"))); + } + return md; + } } diff --git a/src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js b/src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js new file mode 100644 index 00000000..74699249 --- /dev/null +++ b/src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js @@ -0,0 +1,111 @@ +$(document).on('click', '#designationPrintBtn', function (){ + $.ajax({ + url: '/monitoring/designationJson', + type: 'GET', + data: {mdKey: $(this).attr('data-mdkey')}, + dataType:"json", + success: function(data){ + const md = makeDesignationPrintData(data); + var url = $("#printUrl").attr("data-printurl")+"/singlePrint.jsp"; + 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 = "designation"; + form.json.value = JSON.stringify(md); + form.method = "post"; + form.submit(); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +}) + +$(document).on('click', '#analyzePrintBtn', function (){ + $.ajax({ + url: '/intelligenceNetwork/intelligenceAnalyzeJson', + type: 'GET', + data: {iaKey: $(this).attr('data-iakey')}, + dataType:"json", + success: function(data){ + const analyze = makeAnalyzePrintData(data); + var url = $("#printUrl").attr("data-printurl")+"/singlePrint.jsp"; + 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.method = "post"; + form.submit(); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +}) + +function makeDesignationPrintData(data){ + const md = { + mdDt: data.mdDt, + mdTitle: data.mdTitle, + mdName: data.mdName, + mdNationality: data.mdNationality, + mdRank: data.mdRank, + mdBirth: data.mdBirth, + mdAddress: data.mdAddress, + mdCareer: data.mdCareer, + mdEtc: data.mdEtc, + mdReason: data.mdReason, + mdPlan: data.mdPlan, + wrtDt: data.wrtDt.replace("T", " ").substring(0, 16), + wrtPart: data.wrtOrgan+" "+data.wrtPart, + wrtUserGrd: data.wrtUserGrd, + wrtUserNm: data.wrtUserNm + }; + const sectionApprv = data.apprvList[0]; + md.sectionNm = sectionApprv.userGrd+" "+sectionApprv.userNm; + const headApprv = data.apprvList[1]; + md.headNm = headApprv.userGrd+" "+headApprv.userNm; + 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; +} \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/monitoring/designationList.html b/src/main/resources/templates/igActivities/monitoring/designationList.html index 36258fbc..c387620a 100644 --- a/src/main/resources/templates/igActivities/monitoring/designationList.html +++ b/src/main/resources/templates/igActivities/monitoring/designationList.html @@ -4,6 +4,7 @@ layout:decorate="~{layout/layout}"> +
@@ -175,5 +176,11 @@
+
+
+ + +
+
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/monitoring/designationViewModal.html b/src/main/resources/templates/igActivities/monitoring/designationViewModal.html index e6649f7e..e47a6cb0 100644 --- a/src/main/resources/templates/igActivities/monitoring/designationViewModal.html +++ b/src/main/resources/templates/igActivities/monitoring/designationViewModal.html @@ -157,6 +157,9 @@
+ + +