주요사건처리현황 담당사건목록 파일오류 수정.
parent
8c6c48c5f3
commit
8d8cbdfe55
|
|
@ -1,6 +1,7 @@
|
||||||
package com.dbnt.faisp.config;
|
package com.dbnt.faisp.config;
|
||||||
|
|
||||||
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
|
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.CounterIntelligenceActivity;
|
||||||
import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork;
|
import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork;
|
||||||
import com.dbnt.faisp.main.counterIntelligence.service.CounterIntelligenceService;
|
import com.dbnt.faisp.main.counterIntelligence.service.CounterIntelligenceService;
|
||||||
|
|
@ -75,6 +76,7 @@ public class FileController extends BaseService{
|
||||||
private final IntelligenceNetworkService inrelligenceNetworkService;
|
private final IntelligenceNetworkService inrelligenceNetworkService;
|
||||||
private final MonitoringService monitoringService;
|
private final MonitoringService monitoringService;
|
||||||
private final AuthMgtService authMgtService;
|
private final AuthMgtService authMgtService;
|
||||||
|
private final ActivityCaseService activityCaseService;
|
||||||
|
|
||||||
@GetMapping("/editorFileDisplay")
|
@GetMapping("/editorFileDisplay")
|
||||||
public ResponseEntity<Resource> editorFileDisplay(HttpServletRequest request,
|
public ResponseEntity<Resource> editorFileDisplay(HttpServletRequest request,
|
||||||
|
|
@ -271,12 +273,13 @@ public class FileController extends BaseService{
|
||||||
case "sailor": downloadFile = sailorService.selectSailorFile(parentKey, fileSeq); break;
|
case "sailor": downloadFile = sailorService.selectSailorFile(parentKey, fileSeq); break;
|
||||||
case "sri": downloadFile = sriService.selectFaSriFile(parentKey, fileSeq); break;
|
case "sri": downloadFile = sriService.selectFaSriFile(parentKey, fileSeq); break;
|
||||||
case "ciWork": downloadFile = ciService.selectCiWorkFile(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 "ciActivity": downloadFile = ciService.selectCiaForeignerFile(parentKey, fileSeq); break;
|
||||||
case "operationPlan": downloadFile = inrelligenceNetworkService.selectOperationPlanFile(parentKey, fileSeq); break;
|
case "operationPlan": downloadFile = inrelligenceNetworkService.selectOperationPlanFile(parentKey, fileSeq); break;
|
||||||
case "designation": downloadFile = monitoringService.selectDesignationFile(parentKey, fileSeq); break;
|
case "designation": downloadFile = monitoringService.selectDesignationFile(parentKey, fileSeq); break;
|
||||||
case "monitoringResult": downloadFile = monitoringService.selectMonitoringResultFile(parentKey, fileSeq); break;
|
case "monitoringResult": downloadFile = monitoringService.selectMonitoringResultFile(parentKey, fileSeq); break;
|
||||||
case "monitoringReport": downloadFile = monitoringService.selectMonitoringReportFile(parentKey, fileSeq); break;
|
case "monitoringReport": downloadFile = monitoringService.selectMonitoringReportFile(parentKey, fileSeq); break;
|
||||||
|
case "activityCase": downloadFile = activityCaseService.selectActivityCaseFile(parentKey, fileSeq); break;
|
||||||
}
|
}
|
||||||
return downloadFile;
|
return downloadFile;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -176,7 +176,7 @@
|
||||||
<th:block th:each="file:${activityCaseInfo.fileList}">
|
<th:block th:each="file:${activityCaseInfo.fileList}">
|
||||||
<tr class="fileInfoTr">
|
<tr class="fileInfoTr">
|
||||||
<td>
|
<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:data-parentkey="${file.caseKey}" th:data-fileseq="${file.fileSeq}"
|
||||||
th:text="|${file.origNm}.${file.fileExtn}|"></a>
|
th:text="|${file.origNm}.${file.fileExtn}|"></a>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
||||||
|
|
@ -26,27 +26,9 @@
|
||||||
<div class="row mx-0">
|
<div class="row mx-0">
|
||||||
<div class="col-12 card bg-light text-center">
|
<div class="col-12 card bg-light text-center">
|
||||||
<div class="card-body">
|
<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}">
|
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
|
||||||
<div class="row justify-content-between py-1">
|
<div class="row justify-content-end 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="col-8">
|
<div class="col-8">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-11">
|
<div class="col-11">
|
||||||
|
|
|
||||||
|
|
@ -62,12 +62,12 @@
|
||||||
<th:block th:if="${#arrays.isEmpty(majorStatus.fileList)}">
|
<th:block th:if="${#arrays.isEmpty(majorStatus.fileList)}">
|
||||||
<br>파일을 업로드 해주세요.
|
<br>파일을 업로드 해주세요.
|
||||||
</th:block>
|
</th:block>
|
||||||
<!-- <th:block th:unless="${#arrays.isEmpty(majorStatus.fileList)}">-->
|
<th:block th:unless="${#arrays.isEmpty(majorStatus.fileList)}">
|
||||||
<!-- <div class='row-col-6' th:each="infoFile:${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>-->
|
<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>-->
|
<a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
|
||||||
<!-- </div>-->
|
</div>
|
||||||
<!-- </th:block>-->
|
</th:block>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<input type="file" class="d-none" id="fileInputer" multiple>
|
<input type="file" class="d-none" id="fileInputer" multiple>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue