첩보수집활동 > 해양외사 모니터링 > 청산보고서 인쇄기능 추가.

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<String, List<CodeMgt>> codeMap = (Map<String, List<CodeMgt>>) session.getAttribute("commonCode");
     mr = monitoringService.selectResult(mr.getMrKey());
-//    md = monitoringService.getPrintTypeDesignation(md, codeMap);
+    mr = monitoringService.getPrintTypeResult(mr, codeMap);
     return mr;
   }
 

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<String, List<CodeMgt>> 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;
+  }
 }

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),
+    clearTitle: data.clearTitle,
-    wrtPart: data.wrtOrgan+" "+data.wrtPart,
+    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;
 }

src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html

@@ -344,11 +344,5 @@
       </div>
     </div>
   </div>
-  <div class="d-none">
-    <form id="printForm">
-      <input type="hidden" name="crfName">
-      <input type="hidden" name="json">
-    </form>
-  </div>
 </div>
 </html>

src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html

@@ -198,11 +198,5 @@
       </div>
     </div>
   </div>
-  <div class="d-none">
-    <form id="printForm">
-      <input type="hidden" name="crfName">
-      <input type="hidden" name="json">
-    </form>
-  </div>
 </div>
 </html>

src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html

@@ -217,11 +217,5 @@
       </div>
     </div>
   </div>
-  <div class="d-none">
-    <form id="printForm">
-      <input type="hidden" name="crfName">
-      <input type="hidden" name="json">
-    </form>
-  </div>
 </div>
 </html>

src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html

@@ -185,11 +185,5 @@
       </div>
     </div>
   </div>
-  <div class="d-none">
-    <form id="printForm">
-      <input type="hidden" name="crfName">
-      <input type="hidden" name="json">
-    </form>
-  </div>
 </div>
 </html>

src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html

@@ -188,11 +188,5 @@
       </div>
     </div>
   </div>
-  <div class="d-none">
-    <form id="printForm">
-      <input type="hidden" name="crfName">
-      <input type="hidden" name="json">
-    </form>
-  </div>
 </div>
 </html>

src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html

@@ -173,11 +173,5 @@
       </div>
     </div>
   </div>
-  <div class="d-none">
-    <form id="printForm">
-      <input type="hidden" name="crfName">
-      <input type="hidden" name="json">
-    </form>
-  </div>
 </div>
 </html>

src/main/resources/templates/igActivities/monitoring/designationList.html

@@ -176,11 +176,5 @@
       </div>
     </div>
   </div>
-  <div class="d-none">
-    <form id="printForm">
-      <input type="hidden" name="crfName">
-      <input type="hidden" name="json">
-    </form>
-  </div>
 </div>
 </html>

src/main/resources/templates/igActivities/monitoring/resultList.html

@@ -4,6 +4,7 @@
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
   <script type="text/javascript" th:src="@{/js/igActivities/monitoring/result.js}"></script>
+  <script type="text/javascript" th:src="@{/js/igActivities/monitoring/monitoringPrint.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main>

src/main/resources/templates/layout/layout.html

@@ -102,6 +102,12 @@
     </div>
   </div>
 </div>
+<div class="d-none">
+  <form id="printForm">
+    <input type="hidden" name="crfName">
+    <input type="hidden" name="json">
+  </form>
+</div>
 <th:block layout:fragment="modal"></th:block>
 </body>
 </html>