fix:외사대상목표 화면수정

TaehunPark 2022-11-02 17:55:03 +09:00
parent 76609562a3
commit 0489867e62
8 changed files with 43 additions and 48 deletions

View File

@ -147,6 +147,7 @@ public class FipTargetService extends BaseService {
partTmp.setWrtNm(partInfo.getWrtNm());
partTmp.setWrtPart(partInfo.getWrtPart());
partTmp.setWrtOrgan(partInfo.getWrtOrgan());
partTmp.setWrtTitle(partInfo.getWrtTitle());
partTmp.setWrtDt(partInfo.getWrtDt());
partInfoRepository.save(partTmp);
//업데이트하는 버전 파일조회
@ -291,6 +292,7 @@ public class FipTargetService extends BaseService {
partWork.setWrtNm(dbParkWork.getWrtNm());
partWork.setWrtOrgan(dbParkWork.getWrtOrgan());
partWork.setWrtPart(dbParkWork.getWrtPart());
partWork.setWrtTitle(dbParkWork.getWrtTitle());
partWork.setWrtUserSeq(dbParkWork.getWrtUserSeq());
partWorkRepository.save(partWork);
if(deleteFileSeq!=null && deleteFileSeq.size()>0){

View File

@ -13,7 +13,6 @@
<div class="row mx-0">
<div class="col-12 card text-center">
<div class="card-body">
<button id="goExcel">엑셀 다운</button>
<ul class="nav nav-tabs" id="userTab" role="tablist">
<li class="nav-item" role="presentation">
<button class="nav-link" th:classappend="${searchParams.siType eq 'KRCN'?' active':''}" id="krcnTab" data-bs-toggle="tab" type="button" role="tab">한-중 국제여객선 현황</button>
@ -33,7 +32,7 @@
<div class="card">
<div class="card-body">
<div class="row">
<table class="table table-striped">
<table class="table table-hover table-bordered">
<thead>
<tr>
<th>항로</th>
@ -46,7 +45,7 @@
<th>최종수정일</th>
</tr>
</thead>
<tbody>
<tbody class="table-group-divider">
<tr class="shipInfoTr" th:each="si:${shipInfoList}">
<th:block>
<input type="hidden" class="siSeq" th:value="${si.siSeq}">
@ -73,7 +72,10 @@
</tbody>
</table>
</div>
<div class="row justify-content-center">
<div class="row justify-content-between">
<div class="col-auto">
<button class="btn btn-success" id="goExcel">엑셀 다운</button>
</div>
<div class="col-auto">
<nav aria-label="Page navigation">
<ul class="pagination">
@ -99,7 +101,6 @@
</ul>
</nav>
</div>
</div>
<div class="col-auto">
<input type="button" class="btn btn-primary" value="등록" id="addKRCN" th:if="${accessAuth != 'ACC001'} and ${searchParams.siType eq 'KRCN'}">
<input type="button" class="btn btn-primary" value="등록" id="addKRJPRU" th:if="${accessAuth != 'ACC001'} and ${searchParams.siType eq 'KRJPRU'}">
@ -111,6 +112,7 @@
</div>
</div>
</div>
</div>
</main>
<div class="modal fade" id="ipShipModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">

View File

@ -28,7 +28,7 @@
<div class="row justify-content-end">
<div class="col-auto">
<select class="form-select form-select-sm" name="mgtOrgan">
<option value="">-해경서 선택-</option>
<option value="">해경서</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.mgtOrgan}"></option>
@ -57,23 +57,11 @@
</div>
<div class="col-auto">
<input type="text" class="form-control form-control-sm" name="terminalNm" th:value="${searchParams.terminalNm}" placeholder="터미널명">
</div>
<input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
</div>
</div>
</div>
<div class="row justify-content-between py-1">
<div class="col-auto">
<div class="row justify-content-end">
<div class="col-auto">
</div>
<div class="col-auto">
</div>
<div class="col-auto">
<input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="최종수정일" autocomplete="off" readonly th:value="${searchParams.startDate}">
</div>
<input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
</div>
</div>
</div>
@ -85,7 +73,7 @@
<div class="row">
<input type="hidden" id="selectedKey">
<input type="hidden" id="selectedVerNo">
<table class="table table-striped">
<table class="table table-hover table-bordered">
<thead>
<tr>
<th rowspan="3">해경서</th>
@ -125,7 +113,7 @@
<th>비고</th>
</tr>
</thead>
<tbody>
<tbody class="table-group-divider">
<tr class="partInfoTr" th:each="pi:${partInfoList}">
<th:block>
<input type="hidden" class="piSeq" th:value="${pi.piSeq}">
@ -150,7 +138,10 @@
</tbody>
</table>
</div>
<div class="row justify-content-center">
<div class="row justify-content-between">
<div class="col-auto">
<button class="btn btn-success" id="goExcel">엑셀다운</button>
</div>
<div class="col-auto">
<nav aria-label="Page navigation">
<ul class="pagination">
@ -175,10 +166,9 @@
</th:block>
</ul>
</nav>
<div class="col-auto">
<input type="button" class="btn btn-success" value="등록" id="addPartInfo" th:unless="${accessAuth eq 'ACC001'}">
<button id="goExcel">엑셀다운</button>
</div>
<div class="col-auto">
<input type="button" class="btn btn-primary" value="등록" id="addPartInfo" th:unless="${accessAuth eq 'ACC001'}">
</div>
</div>
</div>

View File

@ -146,7 +146,7 @@
<div class="col-auto">
<button type="button" class="btn btn-secondary" id="btn-close" data-bs-dismiss="modal">닫기</button>
<button type="button" class="btn btn-danger" id="deletePartInfo" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">삭제</button>
<button type="button" class="btn btn-primary" id="updatePartInfo" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">수정</button>
<button type="button" class="btn btn-warning" id="updatePartInfo" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">수정</button>
</div>
</div>
</html>

View File

@ -34,7 +34,7 @@
<div class="row">
<input type="hidden" id="selectedKey">
<input type="hidden" id="selectedVerNo">
<table class="table table-striped">
<table class="table table-hover table-bordered">
<thead>
<tr>
<th rowspan="2">외사<br>터미널명</th>
@ -54,7 +54,7 @@
<th>기타</th>
</tr>
</thead>
<tbody>
<tbody class="table-group-divider">
<tr class="partWorkTr" th:each="pw:${partWorkList}">
<th:block th:if="${pw.saveYn eq 'N'} and ${pw.wrtNm eq uesrId}">
<th:block>
@ -100,7 +100,10 @@
</tbody>
</table>
</div>
<div class="row justify-content-center">
<div class="row justify-content-between">
<div class="col-auto">
<button class="btn btn-success" id="goExcel">엑셀다운</button>
</div>
<div class="col-auto">
<nav aria-label="Page navigation">
<ul class="pagination">
@ -125,10 +128,9 @@
</th:block>
</ul>
</nav>
<div class="col-auto">
<input type="button" class="btn btn-success" value="등록" id="addPartWork" th:unless="${accessAuth eq 'ACC001'}">
<button id="goExcel">엑셀다운</button>
</div>
<div class="col-auto">
<input type="button" class="btn btn-primary" value="등록" id="addPartWork" th:unless="${accessAuth eq 'ACC001'}">
</div>
</div>
</div>

View File

@ -88,7 +88,7 @@
<button type="button" class="btn btn-danger" id="deletePartWork">삭제</button>
</th:block>
<th:block th:if="${userId eq pwInfo.wrtNm} or ${accessAuth eq 'ACC003'}"><!--작성자 관리자일 경우 수정 허용-->
<button type="button" class="btn btn-primary" id="updateBtn">수정</button>
<button type="button" class="btn btn-warning" id="updateBtn">수정</button>
</th:block>
</div>
</html>

View File

@ -76,7 +76,6 @@
</div>
<input type="file" class="d-none" id="fileInputer" multiple>
</div>
</form>
</div>
<div class="modal-footer justify-content-between">
@ -88,7 +87,7 @@
<th:block th:unless="${info.vulnKey eq null}">
<button type="button" id="btn-close" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
<button type="button" class="btn btn-danger" id="deleteVuln" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">삭제</button>
<button type="button" class="btn btn-primary" id="updateVuln" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">수정</button>
<button type="button" class="btn btn-warning" id="updateVuln" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">수정</button>
</th:block>
</div>
</div>

View File

@ -27,7 +27,7 @@
<div class="card">
<div class="card-body">
<div class="row">
<table class="table table-striped">
<table class="table table-hover table-bordered">
<thead>
<tr>
<th rowspan="2">구분</th>
@ -40,7 +40,7 @@
<th>C급</th>
</tr>
</thead>
<tbody>
<tbody class="table-group-divider">
<tr class="" th:each="vuln:${vulnerableList}">
<td class="table_id" th:text="${vuln.gubun}"></td>
<td id="infoModal" style="color: blue; cursor:pointer;" th:data-mgtOrgan="${vuln.item_cd}" th:text="${vuln.item_value}"></td>
@ -52,7 +52,7 @@
</table>
</div>
<div class="col-auto">
<input type="button" class="btn btn-success" value="작성" id="addVuln" th:unless="${accessAuth eq 'ACC001'}">
<input type="button" class="btn btn-primary" value="작성" id="addVuln" th:unless="${accessAuth eq 'ACC001'}">
</div>
<div class="row justify-content-center">
</div>