DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

TaehunPark 2022-11-03 17:47:47 +09:00
parent 783792ecba
commit c63e56dd69
15 changed files with 128 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java
View File

@ -287,7 +287,7 @@ public class FipTargetController {
mav.addObject("partWorkList", fipTargetService.selectPartWorkList(partWork));
partWork.setContentCnt(fipTargetService.selectPartWorkListCnt(partWork));
partWork.setPaginationInfo();
mav.addObject("uesrId", loginUser.getUserId());
mav.addObject("uesrSeq", loginUser.getUserSeq());
mav.addObject("searchParams", partWork);
return mav;
}

1
src/main/resources/mybatisMapper/FipTarget.xml
View File

@ -330,6 +330,7 @@
pi.terminal_nm,
(select item_value from code_mgt where item_cd = pw.wrt_title) as wrt_title,
pw.wrt_nm,
pw.wrt_user_seq,
pw.work_dt,
pw.save_yn,
work_type,

3
src/main/resources/static/css/common.css
View File

@ -84,3 +84,6 @@
.pl-15{
padding-left: 15%;
}
.display-none{
display:none
}

28
src/main/resources/templates/fipTarget/ipShipEditModal.html
View File

@ -34,36 +34,40 @@
<br><br>
<div class="mb-3 row">
<label for="shipWeight" class="col-sm-2 col-form-label text-center">국제총톤 수</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="number" class="form-control" id="shipWeight" name="shipWeight">
</div>
<label for="passengerCnt" class="col-sm-2 col-form-label text-center">여객</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="number" class="form-control" id="passengerCnt" name="passengerCnt" placeholder="단위:명">
</div>
</div>
<div class="mb-1 row">
<label for="freightCnt" class="col-sm-2 col-form-label text-center">화물</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="number" class="form-control" id="freightCnt" name="freightCnt" placeholder="단위:TEU">
</div>
</div>
<br><br>
<div class="mb-4 row">
<div class="mb-3 row">
<label for="ownerNm" class="col-sm-2 col-form-label text-center">사업자</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="text" class="form-control" id="ownerNm" name="ownerNm">
</div>
<label for="shipNm" class="col-sm-2 col-form-label text-center">선명</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="text" class="form-control" id="shipNm" name="shipNm">
</div>
</div>
<div class="mb-1 row">
<label for="operationCnt" class="col-sm-2 col-form-label text-center">운항횟수</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="text" class="form-control" id="operationCnt" name="operationCnt" placeholder="ex:주0회(00H)">
</div>
</div>
<div class="mb-1 row">
<label for="closeYn" class="col-sm-2 col-form-label text-center">휴항</label>
<div class="col-sm-2">
<div class="col-sm-3">
<select class="form-select form-select-sm" id="closeYn" name="closeYn">
<option value="">선택</option>
<option value="O">O</option>
@ -74,14 +78,18 @@
<div class="mb-1 row">
<label for="description" class="col-sm-2 col-form-label text-center">비고</label>
<div class="col-sm-4">
<textarea id="description" name="description" rows="4" cols="50"></textarea>
<textarea id="description" name="description" rows="4" cols="65"></textarea>
</div>
</div>
</form>
</div>
<div class="modal-footer justify-content-between">
<div class="col-auto">
<div class="col-auto">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
</div>
<div class="col-auto">
</div>
<div class="col-auto">
<button type="button" class="btn btn-primary" id="saveShipInfo">저장</button>
</div>
</div>

2
src/main/resources/templates/fipTarget/ipShipList.html
View File

@ -11,7 +11,7 @@
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="row mx-0">
<div class="col-12 card text-center">
<div class="card text-center">
<div class="card-body">
<ul class="nav nav-tabs" id="userTab" role="tablist">
<li class="nav-item" role="presentation">

22
src/main/resources/templates/fipTarget/ipShipViewModal.html
View File

@ -44,30 +44,34 @@
<br><br>
<div class="mb-3 row">
<label for="shipWeightM" class="col-sm-2 col-form-label text-center">국제총톤 수</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="number" class="form-control" id="shipWeightM" name="shipWeight" th:value="${shipInfo.shipWeight}">
</div>
<label for="passengerCntM" class="col-sm-2 col-form-label text-center">여객</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="number" class="form-control" id="passengerCntM" name="passengerCnt" th:value="${shipInfo.passengerCnt}" placeholder="단위:명">
</div>
</div>
<div class="mb-1 row">
<label for="freightCntM" class="col-sm-2 col-form-label text-center">화물</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="number" class="form-control" id="freightCntM" name="freightCnt" th:value="${shipInfo.freightCnt}" placeholder="단위:TEU">
</div>
</div>
<br><br>
<div class="mb-4 row">
<label for="ownerNmM" class="col-sm-2 col-form-label text-center">사업자</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="text" class="form-control" id="ownerNmM" name="ownerNm" th:value="${shipInfo.ownerNm}">
</div>
<label for="shipNmM" class="col-sm-2 col-form-label text-center">선명</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="text" class="form-control" id="shipNmM" name="shipNm" th:value="${shipInfo.shipNm}">
</div>
</div>
<div class="mb-1 row">
<label for="operationCntM" class="col-sm-2 col-form-label text-center">운항횟수</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="text" class="form-control" id="operationCntM" name="operationCnt" th:value="${shipInfo.operationCnt}" placeholder="ex:주0회(00H)">
</div>
</div>
@ -90,9 +94,13 @@
</form>
</div>
<div class="modal-footer justify-content-between">
<div class="col-auto">
<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="deleteShipInfo" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">삭제</button>
</div>
<div class="col-auto">
</div>
<div class="col-auto">
<button type="button" class="btn btn-warning" id="updateShipInfo" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">수정</button>
</div>
</div>

9
src/main/resources/templates/fipTarget/partInfoEditModal.html
View File

@ -36,12 +36,12 @@
</div>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">터미널명</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="text" class="form-control" id="terminalNm" name="terminalNm" placeholder="직접입력">
</div>
</div>
<br><br>
<h6>해경</h6>
<h6 class="text-center">해경</h6>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">근무방법</label>
<div class="col-sm-2">
@ -61,7 +61,8 @@
<input type="text" class="form-control" id="mpDescription" name="mpDescription">
</div>
</div>
<h6>육경</h6>
<br>
<h6 class="text-center">육경</h6>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">근무방법</label>
<div class="col-sm-2">
@ -123,6 +124,8 @@
<div class="modal-footer justify-content-between">
<div class="col-auto">
<button type="button" id="btn-close" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
</div>
<div class="col-auto">
<button type="button" class="btn btn-primary" id="savePartInfo">저장</button>
</div>
</div>

63
src/main/resources/templates/fipTarget/partInfoHistory.html
View File

@ -23,7 +23,7 @@
</li>
</ul>
<div class="row justify-content-start">
<div class="col-4">
<div class="col-5">
<div class="card">
<div class="card-body">
<div class="row">
@ -43,7 +43,7 @@
th:value="${partInfo.versionNo}"></td>
<td th:text="|${partInfo.wrtTitle} ${partInfo.wrtNm}|"></td>
<td
th:text="${#temporals.format(partInfo.wrtDt, 'yyyy-MM-dd')}"></td>
th:text="${#temporals.format(partInfo.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
</tr>
</tbody>
</table>
@ -51,69 +51,76 @@
</div>
</div>
</div>
<div class="col-8" id="valueDiv">
<div class="col-7" id="valueDiv">
<br>
<div class="mb-2 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">해경서</label>
<div class="col-sm-3">
<label for="ogCd" class="col-sm-3 col-form-label text-center">해경서</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hMgtOrgan" readonly>
</div>
<label for="ofcCd" class="col-sm-2 col-form-label text-center">육경서</label>
<div class="col-sm-3">
</div>
<div class="mb-2 row">
<label for="ofcCd" class="col-sm-3 col-form-label text-center">육경서</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hLandPolice" readonly>
</div>
</div>
<div class="mb-2 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">담당자</label>
<div class="col-sm-3">
<label for="ogCd" class="col-sm-3 col-form-label text-center">담당자</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hPiUserSeq" readonly>
</div>
</div>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">터미널명</label>
<div class="col-sm-4">
<label for="ogCd" class="col-sm-3 col-form-label text-center">터미널명</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hTerminalNm" readonly>
</div>
</div>
<br>
<h6>해경</h6>
<h6 class="text-center">해경</h6>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">근무방법</label>
<div class="col-sm-3">
<label for="ogCd" class="col-sm-3 col-form-label text-center">근무방법</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hMpWorkType" readonly>
</div>
<label for="ofcCd" class="col-sm-2 col-form-label text-center">인원수</label>
<div class="col-sm-3">
</div>
<div class="mb-1 row">
<label for="ofcCd" class="col-sm-3 col-form-label text-center">인원수</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hMpPeopleCnt" readonly>
</div>
</div>
<div class="mb-3 row">
<label for="ofcCd" class="col-sm-2 col-form-label text-center">비고</label>
<div class="col-sm-4">
<label for="ofcCd" class="col-sm-3 col-form-label text-center">비고</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hMpDescription"
readonly>
</div>
</div>
<h6>육경</h6>
<h6 class="text-center">육경</h6>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">근무방법</label>
<div class="col-sm-3">
<label for="ogCd" class="col-sm-3 col-form-label text-center">근무방법</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hPlWorkType" readonly>
</div>
<label for="ofcCd" class="col-sm-2 col-form-label text-center">인원수</label>
<div class="col-sm-3">
</div>
<div class="mb-3 row">
<label for="ofcCd" class="col-sm-3 col-form-label text-center">인원수</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hPlPeopleCnt" readonly>
</div>
</div>
<div class="mb-3 row">
<label for="ofcCd" class="col-sm-2 col-form-label text-center">비고</label>
<div class="col-sm-4">
<label for="ofcCd" class="col-sm-3 col-form-label text-center">비고</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="hPlDescription"
readonly>
</div>
</div>
<br>
<div class="mb-3 row">
<label for="ofcCd" class="col-sm-2 col-form-label text-center">임차료</label>
<label for="ofcCd" class="col-sm-3 col-form-label text-center">임차료</label>
<div class="col-sm-3">
<input type="text" class="form-control" id="hRentType" readonly>
</div>
@ -122,7 +129,7 @@
</div>
</div>
<div class="mb-3 row">
<label for="ofcCd" class="col-sm-2 col-form-label text-center">공공요금</label>
<label for="ofcCd" class="col-sm-3 col-form-label text-center">공공요금</label>
<div class="col-sm-3">
<input type="text" class="form-control" id="hUtilityType" readonly>
</div>
@ -133,7 +140,7 @@
</div>
<div class="mb-3 row">
<label for="ofcCd" class="col-sm-2 col-form-label text-center">업로드파일</label>
<div class="col-sm-8" id="historyFile"></div>
<div class="col-sm-10" id="historyFile"></div>
</div>
</div>
</div>

12
src/main/resources/templates/fipTarget/partInfoList.html
View File

@ -16,14 +16,15 @@
<form id="searchFm" method="get" th:action="@{/target/partInfoList}">
<input type="hidden" name="excel">
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
<div class="row justify-content-between pe-3 py-1">
<div class="col-auto">
<div class="row pe-3 py-1">
<div class="col-1">
<select class="form-select" name="rowCnt" id="rowCnt">
<th:block th:each="num : ${#numbers.sequence(1,5)}">
<option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt==num*10}"></option>
</th:block>
</select>
</div>
<div class="col-10">
<div class="col-auto">
<div class="row justify-content-end">
<div class="col-auto">
@ -55,16 +56,21 @@
</th:block>
</select>
</div>
<div class="row justify-content-end">
<div class="col-auto">
<input type="text" class="form-control form-control-sm" name="terminalNm" th:value="${searchParams.terminalNm}" placeholder="터미널명">
</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>
</div>
<div class="col-1 d-grid gap-2">
<input type="submit" class="btn btn-lg btn-primary col-auto" id="searchBtn" value="검색">
</div>
</div>
</form>
<div class="row justify-content-start">
<div class="col-12">

10
src/main/resources/templates/fipTarget/partInfoModifyModal.html
View File

@ -19,6 +19,7 @@
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<input type="hidden" name="piSeq" th:value="${partInfo.piSeq}">
<input type="hidden" name="versionNo" th:value="${partInfo.versionNo}">
<br>
<div class="mb-2 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">해경서</label>
<div class="col-sm-3">
@ -49,12 +50,12 @@
</div>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">터미널명</label>
<div class="col-sm-4">
<div class="col-sm-3">
<input type="text" class="form-control" id="mTerminalNm" name="terminalNm" th:value="${partInfo.terminalNm}" placeholder="직접입력">
</div>
</div>
<br><br>
<h6>해경</h6>
<h5 class="text-center">해경</h5>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">근무방법</label>
<div class="col-sm-2">
@ -74,7 +75,8 @@
<input type="text" class="form-control" id="mpDescription" name="mpDescription" th:value="${partInfo.mpDescription}">
</div>
</div>
<h6>육경</h6>
<br>
<h5 class="text-center">육경</h5>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">근무방법</label>
<div class="col-sm-2">
@ -146,6 +148,8 @@
<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>
</div>
<div class="col-auto">
<button type="button" class="btn btn-warning" id="updatePartInfo" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">수정</button>
</div>
</div>

8
src/main/resources/templates/fipTarget/partWorkEditModal.html
View File

@ -76,9 +76,13 @@
</div>
</form>
</div>
<div class="modal-footer">
<div class="modal-footer justify-content-between">
<div class="col-auto">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
<button type="button" class="btn btn-primary" id="saveBtn">저장</button>
</div>
<div class="col-auto">
<button type="button" class="btn btn-primary" id="temporarySaveBtn">임시저장</button>
<button type="button" class="btn btn-primary" id="saveBtn">저장</button>
</div>
</div>
</html>

4
src/main/resources/templates/fipTarget/partWorkList.html
View File

@ -24,7 +24,7 @@
</th:block>
</select>
</div>
<input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
<input type="submit" class="btn btn-sm btn-primary col-auto display-none" id="searchBtn" value="검색">
</div>
</form>
<div class="row justify-content-start">
@ -56,7 +56,7 @@
</thead>
<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 th:if="${pw.saveYn eq 'N'} and ${pw.wrtUserSeq eq uesrSeq}">
<th:block>
<input type="hidden" class="pwSeq" th:value="${pw.pwSeq}">
<input type="hidden" class="piSeq" th:value="${pw.piSeq}">

4
src/main/resources/templates/fipTarget/partWorkModifyModal.html
View File

@ -82,11 +82,13 @@
</div>
</form>
</div>
<div class="modal-footer">
<div class="modal-footer justify-content-between">
<div class="col-auto">
<button type="button" class="btn btn-secondary" id="btn-close" data-bs-dismiss="modal">닫기</button>
<th:block th:if="${userId eq pwInfo.wrtNm} or ${accessAuth eq 'ACC003'}">
<button type="button" class="btn btn-danger" id="deletePartWork">삭제</button>
</th:block>
</div>
<th:block th:if="${userId eq pwInfo.wrtNm} or ${accessAuth eq 'ACC003'}"><!--작성자 관리자일 경우 수정 허용-->
<button type="button" class="btn btn-warning" id="updateBtn">수정</button>
</th:block>

13
src/main/resources/templates/fipTarget/vulnEditModal.html
View File

@ -22,7 +22,7 @@
<input type="hidden" name="wrtNm" th:value="${info.wrtNm}">
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">경찰서</label>
<div class="col-sm-3">
<div class="col-sm-10">
<select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
<option value="">선택</option>
<th:block th:each="organList:${organList}">
@ -38,13 +38,13 @@
</div>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">취약지명</label>
<div class="col-sm-4">
<div class="col-sm-10">
<input type="text" class="form-control" id="vulnNm" name="vulnNm" th:value="${info.vulnNm}" placeholder="직접입력">
</div>
</div>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">취약등급</label>
<div class="col-sm-3">
<div class="col-sm-10">
<select class="form-select form-select-sm" id="vulnType" name="vulnType">
<option value="">선택</option>
<th:block th:each="commonCode:${session.commonCode.get('VULNT')}">
@ -55,7 +55,7 @@
</div>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">비고</label>
<div class="col-sm-4">
<div class="col-sm-10">
<input type="text" class="form-control" id="description" name="description" th:value="${info.description}">
</div>
</div>
@ -80,12 +80,13 @@
</div>
<div class="modal-footer justify-content-between">
<div class="col-auto">
<th:block th:if="${info.vulnKey eq null}">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
</div>
<div class="col-auto">
<th:block th:if="${info.vulnKey eq null}">
<button type="button" class="btn btn-primary" id="saveVuln">저장</button>
</th:block>
<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-warning" id="updateVuln" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">수정</button>
</th:block>

6
src/main/resources/templates/fipTarget/vulnerableList.html
View File

@ -11,7 +11,7 @@
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="row mx-0">
<div class="col-12 card text-center">
<div class="col-12 text-center">
<div class="card-body">
<form method="get" th:action="@{/userMgt/userMgtPage}">
<input type="hidden" name="userStatus" id="userStatus" >
@ -24,7 +24,6 @@
</form>
<div class="row justify-content-start">
<div class="col-12">
<div class="card">
<div class="card-body">
<div class="row">
<table class="table table-hover table-bordered">
@ -52,7 +51,7 @@
</table>
</div>
<div class="col-auto">
<input type="button" class="btn btn-primary" 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>
@ -62,7 +61,6 @@
</div>
</div>
</div>
</div>
</main>
<div class="modal fade" id="vulnEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">