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 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 @@ - 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 @@
-
+ -
-
-
- -
-
- -
-
+
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 @@
파일을 업로드 해주세요.
- - - - - - + +
+ + 삭제 +
+