From de34ecd7756e2332a31652e05db93f1409877060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 4 Jul 2023 17:22:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=A9=EB=B3=B4=EC=88=98=EC=A7=91=ED=99=9C?= =?UTF-8?q?=EB=8F=99=20>=20=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=B2=AD=EC=82=B0?= =?UTF-8?q?=EB=B3=B4=EA=B3=A0=EC=84=9C=20=EC=9D=B8=EC=87=84=EA=B8=B0?= =?UTF-8?q?=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 --- .../monitoring/MonitoringController.java | 2 +- .../monitoring/service/MonitoringService.java | 11 ++++ .../monitoring/monitoringPrint.js | 53 +++++++++++++++++-- .../igActivities/fpiMgt/affair/affairMgt.html | 6 --- .../fpiMgt/affairPlan/planMgt.html | 6 --- .../fpiMgt/affairResult/resultMgt.html | 6 --- .../intelligenceNetwork/analyzeList.html | 6 --- .../fireExtensionReportList.html | 6 --- .../operationPlanList.html | 6 --- .../monitoring/designationList.html | 6 --- .../igActivities/monitoring/resultList.html | 1 + .../resources/templates/layout/layout.html | 6 +++ 12 files changed, 69 insertions(+), 46 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 509843a6..3dadaddf 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 @@ -334,7 +334,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 public MonitoringResult monitoringResultJson(MonitoringResult mr, HttpSession session){ Map> codeMap = (Map>) session.getAttribute("commonCode"); mr = monitoringService.selectResult(mr.getMrKey()); -// md = monitoringService.getPrintTypeDesignation(md, codeMap); + mr = monitoringService.getPrintTypeResult(mr, codeMap); return mr; } 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 64cf02d1..88a23f5f 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 @@ -359,4 +359,15 @@ public class MonitoringService extends BaseService { } return md; } + + public MonitoringResult getPrintTypeResult(MonitoringResult mr, Map> codeMap) { + mr.setWrtPart(Utils.searchCodeValue(mr.getWrtPart(), codeMap.get(mr.getWrtOrgan()))); + mr.setWrtOrgan(Utils.searchCodeValue(mr.getWrtOrgan(), codeMap.get("OG"))); + mr.setWrtUserGrd(Utils.searchCodeValue(mr.getWrtUserGrd(), codeMap.get("JT"))); + for(MonitoringResultClearInfo info: mr.getClearInfoList()){ + info.setUseCatg(Utils.searchCodeValue(info.getUseCatg(), codeMap.get("RIC"))); + info.setUseDetail(Utils.searchCodeValue(info.getUseDetail(), codeMap.get("RID"))); + } + 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 94e00773..56ba4925 100644 --- a/src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js +++ b/src/main/resources/static/js/igActivities/monitoring/monitoringPrint.js @@ -77,10 +77,57 @@ function makeDesignationPrintData(data){ function makeResultPrintData(data){ const result = { - wrtDt: data.wrtDt.replace("T", " ").substring(0, 16), - wrtPart: data.wrtOrgan+" "+data.wrtPart, + clearTitle: data.clearTitle, + monitoringYn:data.monitoringYn, + monitoringReason: data.monitoringReason, + mrSdate: data.mrSdate, + mrEdate: data.mrEdate, + mrPrice: data.mrPrice, + md:{ + mdName:data.md.mdName, + mdRank:data.md.mdRank, + mdNationality:data.md.mdNationality, + mdDt:data.md.mdDt + }, + clearInfoList:[], + resultTitle: data.mrTitle, + resultInfoList: [], + reportList:[], + fileList: [], + sectionApprv: data.apprvList[0].userNm, + headApprv: data.apprvList[1].userNm, + wrtOrgan: data.wrtOrgan, + wrtPart: data.wrtPart, wrtUserGrd: data.wrtUserGrd, - wrtUserNm: data.wrtUserNm + wrtUserNm: data.wrtUserNm, + wrtDt: data.wrtDt.replace("T", " ").substring(0, 16) }; + for(const info of data.clearInfoList){ + result.clearInfoList.push({ + useCatg: info.useCatg, + useDetail: info.useDetail, + price: info.price + }) + } + for(const info of data.resultInfoList){ + result.resultInfoList.push({ + contactDate: info.contactDate, + contactStime: info.contactStime, + contactEtime: info.contactEtime, + contactInfo: info.contactInfo + }) + } + for(const info of data.reportList){ + result.reportList.push({ + contactDate: info.contactDate, + writeDate: info.writeDate, + reportTitle: info.reportTitle + }) + } + for(const info of data.fileList){ + result.fileList.push({ + origNm: info.origNm+"."+info.fileExtn + }) + } return result; } \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index 40344ea8..1d6f7cfd 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -344,11 +344,5 @@ -
-
- - -
-
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html index 3bdc581a..01fba2f4 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html @@ -198,11 +198,5 @@ -
-
- - -
-
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html index b187b78c..3d085c69 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html @@ -217,11 +217,5 @@ -
-
- - -
-
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html index 3d11568f..1bc93510 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html @@ -185,11 +185,5 @@ -
-
- - -
-
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html index 9de6d043..47fede4f 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html @@ -188,11 +188,5 @@ -
-
- - -
-
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html index 75f5afc5..e3a1e94d 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html @@ -173,11 +173,5 @@ -
-
- - -
-
\ 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 c387620a..e2982639 100644 --- a/src/main/resources/templates/igActivities/monitoring/designationList.html +++ b/src/main/resources/templates/igActivities/monitoring/designationList.html @@ -176,11 +176,5 @@ -
-
- - -
-
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/monitoring/resultList.html b/src/main/resources/templates/igActivities/monitoring/resultList.html index 9a5f9dc6..5345dc9d 100644 --- a/src/main/resources/templates/igActivities/monitoring/resultList.html +++ b/src/main/resources/templates/igActivities/monitoring/resultList.html @@ -4,6 +4,7 @@ layout:decorate="~{layout/layout}"> +
diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html index 3d84ec05..98d143bf 100644 --- a/src/main/resources/templates/layout/layout.html +++ b/src/main/resources/templates/layout/layout.html @@ -102,6 +102,12 @@
+
+
+ + +
+
\ No newline at end of file