From 8d8cbdfe554ddeef23359902a597b4260ea7f60d 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: Tue, 11 Jul 2023 16:58:54 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=9A=94=EC=82=AC=EA=B1=B4=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=ED=98=84=ED=99=A9=20=EB=8B=B4=EB=8B=B9=EC=82=AC?=
 =?UTF-8?q?=EA=B1=B4=EB=AA=A9=EB=A1=9D=20=ED=8C=8C=EC=9D=BC=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dbnt/faisp/config/FileController.java |  5 ++++-
 .../activityCase/activityCaseViewModal.html   |  2 +-
 .../illegalShipSailorPage.html                | 22 ++-----------------
 .../majorStatus/majorStatusEditModal.html     | 12 +++++-----
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java
index 1405e54c..96d660aa 100644
--- a/src/main/java/com/dbnt/faisp/config/FileController.java
+++ b/src/main/java/com/dbnt/faisp/config/FileController.java
@@ -1,6 +1,7 @@
 package com.dbnt.faisp.config;
 
 import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.counterIntelligence.activityCase.service.ActivityCaseService;
 import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity;
 import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork;
 import com.dbnt.faisp.main.counterIntelligence.service.CounterIntelligenceService;
@@ -75,6 +76,7 @@ public class FileController extends BaseService{
   private final IntelligenceNetworkService inrelligenceNetworkService;
   private final MonitoringService monitoringService;
   private final AuthMgtService authMgtService;
+  private final ActivityCaseService activityCaseService;
 
   @GetMapping("/editorFileDisplay")
   public ResponseEntity<Resource> editorFileDisplay(HttpServletRequest request,
@@ -271,12 +273,13 @@ public class FileController extends BaseService{
       case "sailor": downloadFile = sailorService.selectSailorFile(parentKey, fileSeq); break;
       case "sri": downloadFile = sriService.selectFaSriFile(parentKey, fileSeq); break;
       case "ciWork": downloadFile = ciService.selectCiWorkFile(parentKey, fileSeq); break;
-      case "MajorFile" : downloadFile = majorStatusService.selectMajorFile(parentKey, fileSeq); break;
+      case "majorFile" : downloadFile = majorStatusService.selectMajorFile(parentKey, fileSeq); break;
       case "ciActivity": downloadFile = ciService.selectCiaForeignerFile(parentKey, fileSeq); break;
       case "operationPlan": downloadFile = inrelligenceNetworkService.selectOperationPlanFile(parentKey, fileSeq); break;
       case "designation": downloadFile = monitoringService.selectDesignationFile(parentKey, fileSeq); break;
       case "monitoringResult": downloadFile = monitoringService.selectMonitoringResultFile(parentKey, fileSeq); break;
       case "monitoringReport": downloadFile = monitoringService.selectMonitoringReportFile(parentKey, fileSeq); break;
+      case "activityCase": downloadFile = activityCaseService.selectActivityCaseFile(parentKey, fileSeq); break;
     }
     return downloadFile;
   }
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html
index 83cfffb8..06508b07 100644
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html
+++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html
@@ -176,7 +176,7 @@
               <th:block th:each="file:${activityCaseInfo.fileList}">
                 <tr class="fileInfoTr">
                   <td>
-                    <a href="#" class="fileDownLink" data-board="ciWork"
+                    <a href="#" class="fileDownLink" data-board="activityCase"
                          th:data-parentkey="${file.caseKey}" th:data-fileseq="${file.fileSeq}"
                          th:text="|${file.origNm}.${file.fileExtn}|"></a>
                   </td>
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
index 9477d2bd..c5ca7648 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
@@ -26,27 +26,9 @@
     <div class="row mx-0">
       <div class="col-12 card bg-light text-center">
         <div class="card-body">
-          <form method="get" th:action="@{/faStatistics/illegalShipSailor}" id="cdsSearchForm">
+          <form method="get" th:action="@{/unlawfulFishing/illegalShipSailor}" id="issSearchForm">
             <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
-            <div class="row justify-content-between py-1">
-              <div class="col-auto">
-                <div>
-                  <select class="form-select form-select-sm" name="year">
-                    <option value="">연도</option>
-                    <th:block th:each="year : ${yearList}">
-                      <option th:value="${year}" th:text="|${year}년|" th:selected="${searchParams.year eq year}"></option>
-                    </th:block>
-                  </select>
-                </div>
-                <div>
-                  <select class="form-select form-select-sm" name="month">
-                    <option value="">월 선택</option>
-                    <th:block th:each="month : ${#numbers.sequence(1, 12)}">
-                      <option th:value="${month}" th:text="|${month}월|" th:selected="${searchParams.month eq month}"></option>
-                    </th:block>
-                  </select>
-                </div>
-              </div>
+            <div class="row justify-content-end py-1">
               <div class="col-8">
                 <div class="row">
                   <div class="col-11">
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
index 2c021667..26cd3e7d 100644
--- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
+++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
@@ -62,12 +62,12 @@
                     <th:block th:if="${#arrays.isEmpty(majorStatus.fileList)}">
                         <br>파일을 업로드 해주세요.
                     </th:block>
-<!--                    <th:block th:unless="${#arrays.isEmpty(majorStatus.fileList)}">-->
-<!--                        <div class='row-col-6' th:each="infoFile:${majorStatus.fileList}">-->
-<!--                            <span th:data-fileseq="${majorFile.fileSeq}" th:text="|${majorFile.origNm}.${majorFile.fileExtn} $majorFile.fileSize}|"></span>-->
-<!--                            <a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>-->
-<!--                        </div>-->
-<!--                    </th:block>-->
+                    <th:block th:unless="${#arrays.isEmpty(majorStatus.fileList)}">
+                        <div class='row-col-6' th:each="majorFile:${majorStatus.fileList}">
+                            <span th:data-fileseq="${majorFile.fileSeq}" th:text="|${majorFile.origNm}.${majorFile.fileExtn} ${majorFile.fileSize}|"></span>
+                            <a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
+                        </div>
+                    </th:block>
                 </div>
             </div>
             <input type="file" class="d-none" id="fileInputer" multiple>