From d540c37933eb8a5b3cef69ece66d245125c44767 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Sat, 28 Jan 2023 16:08:17 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B2=A9=EB=B3=B4=EC=88=98=EC=A7=91=ED=99=9C?=
 =?UTF-8?q?=EB=8F=99=EC=9D=BC=EB=B6=80,=20=EC=99=B8=EC=82=AC=EC=9E=A5?=
 =?UTF-8?q?=EB=B9=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/equip/cellPhoneEditModal.html          |  4 +++-
 .../resources/templates/equip/cellPhoneList.html     |  2 +-
 .../resources/templates/equip/equipEditModal.html    |  4 +++-
 src/main/resources/templates/equip/equipHistory.html |  4 +++-
 src/main/resources/templates/equip/equipList.html    |  4 +++-
 .../resources/templates/equip/equipModifyModal.html  |  4 +++-
 src/main/resources/templates/equip/useEditModal.html |  4 +++-
 src/main/resources/templates/equip/useHistory.html   |  4 +++-
 .../resources/templates/equip/useModifyModal.html    |  4 +++-
 .../templates/fipTarget/ipShipEditModal.html         |  2 ++
 .../resources/templates/fipTarget/ipShipHistory.html |  2 ++
 .../resources/templates/fipTarget/ipShipList.html    |  4 +++-
 .../templates/fipTarget/ipShipViewModal.html         |  2 ++
 .../resources/templates/fipTarget/partInfoList.html  | 12 +++++++++---
 .../igActivities/fpiMgt/affairPlan/planMgt.html      |  4 +++-
 15 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/equip/cellPhoneEditModal.html b/src/main/resources/templates/equip/cellPhoneEditModal.html
index b9aec63b..f249c69a 100644
--- a/src/main/resources/templates/equip/cellPhoneEditModal.html
+++ b/src/main/resources/templates/equip/cellPhoneEditModal.html
@@ -21,7 +21,7 @@
     <input type="hidden" name="wrtUserSeq" th:value="${info.wrtUserSeq}">
     <input type="hidden" name="wrtNm" th:value="${info.wrtNm}">
     <div class="row mb-1">
-      <label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
+      <label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-6">
         <select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
           <option value="">선택</option>
@@ -85,7 +85,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
 	<div class="col-auto">
+<!--
 		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 	<th:block th:if="${info.phoneKey != null}">
 		<button type="button" class="btn btn-danger" id="deleteCellPhoneM"th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">삭제</button>
 	</th:block>
diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html
index e851b6f9..38c01888 100644
--- a/src/main/resources/templates/equip/cellPhoneList.html
+++ b/src/main/resources/templates/equip/cellPhoneList.html
@@ -49,7 +49,7 @@
                       <thead>
                       <tr class="table-secondary">
                         <th> <input type="checkbox" id="chk-all" class="equInfoCheckBox"></th>
-                        <th>연번</th>
+                        <th>순번</th>
                         <th>소속</th>
                         <th>전화번호</th>
                         <th>사용자(관리자)</th>
diff --git a/src/main/resources/templates/equip/equipEditModal.html b/src/main/resources/templates/equip/equipEditModal.html
index a94cf33c..bca01710 100644
--- a/src/main/resources/templates/equip/equipEditModal.html
+++ b/src/main/resources/templates/equip/equipEditModal.html
@@ -9,7 +9,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 mb-3">
-      <label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
+      <label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-6">
         <select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
           <option value="">선택</option>
@@ -81,7 +81,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
 	<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   </div>
   <div class="col-auto">
     <button type="button" class="btn btn-primary" id="saveEquip">저장</button>
diff --git a/src/main/resources/templates/equip/equipHistory.html b/src/main/resources/templates/equip/equipHistory.html
index f31f86c4..69963a76 100644
--- a/src/main/resources/templates/equip/equipHistory.html
+++ b/src/main/resources/templates/equip/equipHistory.html
@@ -97,7 +97,7 @@
             <div class="col-auto">최신데이터</div>
           </div>
           <div class="row mb-1">
-            <label for="vSosok" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
+            <label for="vSosok" class="col-sm-4 col-form-label col-form-label-sm text-center">관서</label>
             <div class="col-sm-6">
               <input type="text" class="form-control form-control-sm" th:value="${lastVersion.sosok}" readonly>
             </div>
@@ -152,7 +152,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   </div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html
index 6c169f24..26758ff0 100644
--- a/src/main/resources/templates/equip/equipList.html
+++ b/src/main/resources/templates/equip/equipList.html
@@ -48,6 +48,7 @@
                       <thead>
                       <tr class="table-secondary">
                         <th> <input type="checkbox" id="chk-all" class="equInfoCheckBox"></th>
+                        <th>순번</th>
                         <th>소속</th>
                         <th>세부소속</th>
                         <th>장비사진</th>
@@ -58,12 +59,13 @@
                       </tr>
                       </thead>
                       <tbody class="table-group-divider">
-                      <tr class="equipTr" th:each="equ:${equipList}">
+                      <tr class="equipTr" th:each="equ,cnt:${equipList}">
                       	<td>
                       		<input type="checkbox" name="equChk" class="equInfoCheckBox">
                       		<input type="hidden" class="equKey" th:value="${equ.equKey}">
                       		<input type="hidden" class="verNo" th:value="${equ.versionNo}">
                       	</td>
+                        <td th:text="${cnt.count}"></td>
                       	<td th:text="${equ.sosok}"></td>
                       	<td th:text="${equ.detailSosok}"></td> 
                       	<td>
diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html
index 8dbf497a..6a724ec5 100644
--- a/src/main/resources/templates/equip/equipModifyModal.html
+++ b/src/main/resources/templates/equip/equipModifyModal.html
@@ -11,7 +11,7 @@
     <input type="hidden" id="mEquKey" name="equKey" th:value="${equInfo.equKey}">
     <input type="hidden" name="versionNo" th:value="${equInfo.versionNo}">
     <div class="row mb-3">
-      <label for="mMgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
+      <label for="mMgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-6">
         <select class="form-select form-select-sm" id="mMgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
           <option value="">선택</option>
@@ -98,7 +98,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary modalCloseBtn" data-bs-dismiss="modal">닫기</button>
+-->
     <button type="button" class="btn btn-danger" id="deleteEquip" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">삭제</button>
   </div>
   <div class="col-auto">
diff --git a/src/main/resources/templates/equip/useEditModal.html b/src/main/resources/templates/equip/useEditModal.html
index bcc6f8b0..0a50ff46 100644
--- a/src/main/resources/templates/equip/useEditModal.html
+++ b/src/main/resources/templates/equip/useEditModal.html
@@ -11,7 +11,7 @@
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <input type="hidden" name="useType" th:value="${useType}">
     <div class="row mb-1">
-      <label for="mgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">사용관서</label>
+      <label for="mgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-6">
         <select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
           <option value="">선택</option>
@@ -62,7 +62,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   </div>
   <div class="col-auto">
     <button type="button" class="btn btn-primary" id="saveUse">저장</button>
diff --git a/src/main/resources/templates/equip/useHistory.html b/src/main/resources/templates/equip/useHistory.html
index a8c540da..38cd9422 100644
--- a/src/main/resources/templates/equip/useHistory.html
+++ b/src/main/resources/templates/equip/useHistory.html
@@ -41,7 +41,7 @@
             </div>
             <div class="col-6" id="valueDiv">
             <div class="row mb-3 mt-3">
-		      <label for="cat1Cd" class="col-2 col-sm-3 col-form-label col-form-label-sm text-center">사용관서</label>
+		      <label for="cat1Cd" class="col-2 col-sm-3 col-form-label col-form-label-sm text-center">관서</label>
 		      <div class="col-sm-8">
 		        <input type="text" class="form-control" id="vSosok" disabled>
 		      </div>
@@ -78,7 +78,9 @@
        	</div>
         <div class="modal-footer justify-content-between bg-light">
 		  <div class="col-auto">
+<!--
 		    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 		  </div>
 		</div>
       </div>
diff --git a/src/main/resources/templates/equip/useModifyModal.html b/src/main/resources/templates/equip/useModifyModal.html
index ed0e1439..c34cf637 100644
--- a/src/main/resources/templates/equip/useModifyModal.html
+++ b/src/main/resources/templates/equip/useModifyModal.html
@@ -15,7 +15,7 @@
     <input type="hidden" name="useType" th:value="${info.useType}">
     <input type="hidden" name="versionNo" th:value="${info.versionNo}">
     <div class="row mb-1">
-      <label for="mMgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">사용관서</label>
+      <label for="mMgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-6 ">
         <select class="form-select form-select-sm" id="mMgtOrgan" name="mgtOrgan" disabled>
           <option value="">선택</option>
@@ -66,7 +66,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary" id="closeModal" data-bs-dismiss="modal">닫기</button>
+-->
   </div>
   <div class="col-auto">
     <button type="button" class="btn btn-warning" id="updateUse" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">수정</button>
diff --git a/src/main/resources/templates/fipTarget/ipShipEditModal.html b/src/main/resources/templates/fipTarget/ipShipEditModal.html
index 03af3543..15c4bad0 100644
--- a/src/main/resources/templates/fipTarget/ipShipEditModal.html
+++ b/src/main/resources/templates/fipTarget/ipShipEditModal.html
@@ -97,7 +97,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   </div>
   <div class="col-auto">
   </div>
diff --git a/src/main/resources/templates/fipTarget/ipShipHistory.html b/src/main/resources/templates/fipTarget/ipShipHistory.html
index 6e56bea6..6351a258 100644
--- a/src/main/resources/templates/fipTarget/ipShipHistory.html
+++ b/src/main/resources/templates/fipTarget/ipShipHistory.html
@@ -48,7 +48,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   </div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/fipTarget/ipShipList.html b/src/main/resources/templates/fipTarget/ipShipList.html
index 4b25cfde..56a1f28a 100644
--- a/src/main/resources/templates/fipTarget/ipShipList.html
+++ b/src/main/resources/templates/fipTarget/ipShipList.html
@@ -90,6 +90,7 @@
                 <table class="table table-sm table-hover table-bordered">
                   <thead>
                   <tr class="table-secondary">
+                    <th>순번</th>
                     <th>항로</th>
                     <th>사업자<br>(한국대리점)</th>
                     <th>선명</th>
@@ -101,10 +102,11 @@
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
-                  <tr class="shipInfoTr" th:each="si:${shipInfoList}">
+                  <tr class="shipInfoTr" th:each="si,cnt:${shipInfoList}">
                     <input type="hidden" class="siSeq" th:value="${si.siSeq}">
                     <input type="hidden" class="siType" th:value="${si.siType}">
                     <input type="hidden" class="verNo" th:value="${si.versionNo}">
+                    <td th:text="${cnt.count}"></td>
                     <td>
                       <div th:text="|${si.startPoint}/${si.endPoint}|"></div>
                       <div th:text="|(${si.distanceNm}해리,${si.distanceKm}km)|"></div>
diff --git a/src/main/resources/templates/fipTarget/ipShipViewModal.html b/src/main/resources/templates/fipTarget/ipShipViewModal.html
index 7dfcaaf5..36360949 100644
--- a/src/main/resources/templates/fipTarget/ipShipViewModal.html
+++ b/src/main/resources/templates/fipTarget/ipShipViewModal.html
@@ -109,7 +109,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary modalCloseBtn" 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">
diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html
index 99eeb7b6..6ca5b626 100644
--- a/src/main/resources/templates/fipTarget/partInfoList.html
+++ b/src/main/resources/templates/fipTarget/partInfoList.html
@@ -35,6 +35,7 @@
                 <div class="row">
                   <div class="col-11">
                     <div class="row justify-content-end pb-1">
+
                       <div class="col-2">
                         <select class="form-select form-select-sm" name="mgtOrgan">
                           <option value="">해경서</option>
@@ -96,6 +97,7 @@
                   <table class="table table-sm table-hover table-bordered">
                     <thead>
                     <tr class="table-secondary">
+                      <th rowspan="2">순번</th>
                       <th rowspan="2">해경서</th>
                       <th rowspan="2">육경서</th>
                       <th rowspan="2">터미널명</th>
@@ -126,13 +128,14 @@
                     </tr>
                     </thead>
                     <tbody class="table-group-divider">
-                    <tr class="partInfoTr" th:each="pi:${partInfoList}">
+                    <tr class="partInfoTr" th:each="pi,cnt:${partInfoList}">
                        <th:block th:if="${pi.piState eq 'DST001'} and ${pi.wrtUserSeq eq loginUser}">
                           <th:block>
 	                        <input type="hidden" class="piSeq" th:value="${pi.piSeq}">
 	                        <input type="hidden" class="verNo" th:value="${pi.versionNo}">
 	                      </th:block>
-	                      <td th:text="${pi.mgtOrgan}"></td>
+                         <td th:text="${cnt.count}"></td>
+                         <td th:text="${pi.mgtOrgan}"></td>
 	                      <td th:text="${pi.landPolice}"></td>
 	                      <td style="color : red;" th:text="|[임시저장] ${pi.terminalNm}|"></td>
 	                      <td th:text="${pi.piManagerName}"></td>
@@ -153,7 +156,8 @@
 	                        <input type="hidden" class="piSeq" th:value="${pi.piSeq}">
 	                        <input type="hidden" class="verNo" th:value="${pi.versionNo}">
 	                      </th:block>
-	                      <td th:text="${pi.mgtOrgan}"></td>
+                        <td th:text="${cnt.count}"></td>
+                        <td th:text="${pi.mgtOrgan}"></td>
 	                      <td th:text="${pi.landPolice}"></td>
 	                      <td th:text="${pi.terminalNm}"></td>
 	                      <td th:text="${pi.piManagerName}"></td>
@@ -184,6 +188,7 @@
                         <th th:text="|상주 ${total.pl_sangju}개소 ${total.pl_sangju_total}명|"></th>
                         <th th:text="|비상주 ${total.pl_bsangju}개소|"></th>
                         <th th:text="|폐쇄 ${total.pl_closure}개소|"></th>
+                        <th></th>
                       </th:block>
                       <th:block th:unless="${not #strings.isEmpty(total)}">
                         <th>상주 0개소 0명</th>
@@ -193,6 +198,7 @@
                         <th>상주 0개소 0명</th>
                         <th>비상주 0개소</th>
                         <th>폐쇄 0개소</th>
+                        <th></th>
                       </th:block>
                       <th></th>
                       <th></th>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html
index aa0263d0..7d00261c 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html
@@ -98,6 +98,7 @@
                   <thead>
                   <tr class="table-secondary">
                     <th></th>
+                    <th>순번</th>
                     <th>제목</th>
                     <th>시행일자</th>
                     <th>관서</th>
@@ -109,9 +110,10 @@
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
-                  <tr class="planTr" th:each="plan:${planList}">
+                  <tr class="planTr" th:each="plan,cnt:${planList}">
                     <input type="hidden" class="planKey" th:value="${plan.planKey}">
                     <td><input type="checkbox" class="trChkBox"></td>
+                    <td th:text="${cnt.count}"></td>
                     <td th:text="${plan.contentTitle}"></td>
                     <td th:text="${#temporals.format(plan.planDt, 'yyyy-MM-dd')}"></td>
                     <th:block th:each="commonCode:${session.commonCode.get('OG')}">