From 04d9a69dac4b42fdae64190bfb0b695f39cf771e Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Sat, 28 Jan 2023 10:50:45 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=9C=EC=84=9C=20=EC=A0=95=EB=A0=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/faStatistics/asfCov/asfCov.html    | 12 ++++++------
 .../templates/ivsgt/ivsgtEditModal.html          |  2 +-
 .../templates/police/career/careerMgt.html       |  2 ++
 .../templates/police/education/educationMgt.html | 16 ++++------------
 .../templates/police/police/policeList.html      |  2 ++
 .../publicBoard/board/boardEditModal.html        |  2 ++
 .../templates/publicBoard/board/boardPage.html   | 15 ++++++++-------
 .../publicBoard/board/boardViewModal.html        |  2 ++
 .../publicBoard/notice/noticeEditModal.html      |  2 ++
 .../templates/publicBoard/notice/noticePage.html | 15 +++++++++------
 .../publicBoard/notice/noticeViewModal.html      |  2 ++
 .../templates/publicBoard/qna/qnaPage.html       | 15 ++++++++-------
 .../reference/referenceEditModal.html            |  2 ++
 .../publicBoard/reference/referencePage.html     | 11 +++++++----
 .../reference/referenceViewModal.html            |  2 ++
 15 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCov.html b/src/main/resources/templates/faStatistics/asfCov/asfCov.html
index 50525066..7572ab92 100644
--- a/src/main/resources/templates/faStatistics/asfCov/asfCov.html
+++ b/src/main/resources/templates/faStatistics/asfCov/asfCov.html
@@ -101,15 +101,15 @@
                       <th rowspan="3">사건담당경찰서</th>
                       <th rowspan="3">단속경찰서</th>
                       <th rowspan="3">단속함정</th>
-                      <th rowspan="2">압송</th>
+                      <th width="80px" rowspan="2">압송</th>
                       <th colspan="2">미압송</th>
                     </tr>
                     <tr class="table-secondary">
-                      <th>현장조사</th>
-                      <th>기타</th>
-                      <th>검사인원</th>
-                      <th>양성</th>
-                      <th>음성</th>
+                      <th width="80px">현장조사</th>
+                      <th width="80px">기타</th>
+                      <th width="80px">검사인원</th>
+                      <th width="80px">양성</th>
+                      <th width="80px">음성</th>
                     </tr>
                     <tr class="table-secondary">
                       <th></th>
diff --git a/src/main/resources/templates/ivsgt/ivsgtEditModal.html b/src/main/resources/templates/ivsgt/ivsgtEditModal.html
index 0473f627..8838c91f 100644
--- a/src/main/resources/templates/ivsgt/ivsgtEditModal.html
+++ b/src/main/resources/templates/ivsgt/ivsgtEditModal.html
@@ -57,7 +57,7 @@
       <div class="col-sm-2">
         <select class="form-select form-select-sm" name="arrestCd" id="arrestCd">
           <option value="">검거유형1 선택-</option>
-          <th:block th:each="commonCode:${session.commonCode.get('AT')}">
+          <th:block th:each="commonCode:${session.commonCode.get('CTH')}">
             <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
                     th:selected="${boardInvestigation.arrestType != null and commonCode.itemCd eq boardInvestigation.arrestType.arrestCd}"></option>
           </th:block>
diff --git a/src/main/resources/templates/police/career/careerMgt.html b/src/main/resources/templates/police/career/careerMgt.html
index 39489c99..27af0cf6 100644
--- a/src/main/resources/templates/police/career/careerMgt.html
+++ b/src/main/resources/templates/police/career/careerMgt.html
@@ -80,6 +80,7 @@
                       <thead>
                       <tr class="table-secondary">
                         <th>순번</th>
+                        <th>직책</th>
                         <th>계급</th>
                         <th>성명</th>
                         <th>청</th>
@@ -98,6 +99,7 @@
                       <tr class="policeTr" th:each="police:${policeList}">
                         <input type="hidden" class="userSeq" th:value="${police.userSeq}">
                         <td th:text="${police.rownum}"></td>
+                        <td></td>
                         <td th:text="${police.titleCd}"></td>
                         <td th:text="${police.userNm}"></td>
                         <td th:text="${police.organNm}"></td>
diff --git a/src/main/resources/templates/police/education/educationMgt.html b/src/main/resources/templates/police/education/educationMgt.html
index 2d98fca3..7aa266ec 100644
--- a/src/main/resources/templates/police/education/educationMgt.html
+++ b/src/main/resources/templates/police/education/educationMgt.html
@@ -81,18 +81,14 @@
                       <thead>
                       <tr class="table-secondary">
                         <th>순번</th>
+                        <th>직책</th>
                         <th>계급</th>
                         <th>성명</th>
                         <th>청</th>
                         <th>현부서<br>과</th>
                         <th>생년월일</th>
                         <th>성별</th>
-                        <th>고등학교</th>
-                        <th>전문대</th>
-                        <th>대학교</th>
-                        <th>석사</th>
-                        <th>박사</th>
-                        <th>전공</th>
+
                         <th>최종수정일</th>
                       </tr>
                       </thead>
@@ -102,18 +98,14 @@
                           <input type="hidden" class="userSeq" th:value="${list.userSeq}">
                         </th:block>
                         <td th:text="${list.rownum}"></td>
+                        <td></td>
                         <td th:text="${list.titleCd}"></td>
                         <td th:text="${list.userNm}"></td>
                         <td th:text="${list.organNm}"></td>
                         <td th:text="${list.ofcCd}"></td>
                         <td th:text="${list.birthDate}"></td>
                         <td th:text="${list.sex}"></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
+
                         <td th:text="${#temporals.format(list.lastWrtDt, 'yyyy-MM-dd')}"></td>
                       </tr>
                       </tbody>
diff --git a/src/main/resources/templates/police/police/policeList.html b/src/main/resources/templates/police/police/policeList.html
index 05ee433d..f2a5a168 100644
--- a/src/main/resources/templates/police/police/policeList.html
+++ b/src/main/resources/templates/police/police/policeList.html
@@ -94,6 +94,7 @@
                       <thead>
                       <tr class="table-secondary">
                         <th>순번</th>
+                        <th>직책</th>
                         <th>계급</th>
                         <th>성명</th>
                         <th>청</th>
@@ -121,6 +122,7 @@
                           <input type="hidden" class="userSeq" th:value="${list.userSeq}">
                         </th:block>
                         <td th:text="${list.rownum}"></td>
+                        <td></td>
                         <td th:text="${list.titleCd}"></td>
                         <td th:text="${list.userNm}"></td>
                         <td th:text="${list.organNm}"></td>
diff --git a/src/main/resources/templates/publicBoard/board/boardEditModal.html b/src/main/resources/templates/publicBoard/board/boardEditModal.html
index b3b0a4c6..74b03ec4 100644
--- a/src/main/resources/templates/publicBoard/board/boardEditModal.html
+++ b/src/main/resources/templates/publicBoard/board/boardEditModal.html
@@ -66,6 +66,8 @@
   </form>
 </div>
 <div class="modal-footer bg-light">
+<!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   <button type="button" class="btn btn-primary" id="saveBtn">저장</button>
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/publicBoard/board/boardPage.html b/src/main/resources/templates/publicBoard/board/boardPage.html
index 4ef8bfc6..df87551a 100644
--- a/src/main/resources/templates/publicBoard/board/boardPage.html
+++ b/src/main/resources/templates/publicBoard/board/boardPage.html
@@ -65,22 +65,25 @@
                       <table class="table table-sm table-hover table-bordered">
                         <thead>
                         <tr class="table-color">
-                          <th></th>
+                          <th>순번</th>
                           <th>제목</th>
+                          <th>첨부파일</th>
+                          <th>댓글</th>
                           <th>관서</th>
                           <th>부서</th>
                           <th>계급</th>
                           <th>작성자</th>
                           <th>작성일시</th>
-                          <th>첨부파일</th>
-                          <th>댓글</th>
                         </tr>
                         </thead>
                         <tbody class="table-group-divider">
-                        <tr class="planTr" th:each="board:${boardList}">
+                        <tr class="planTr" th:each="board,cnt:${boardList}">
                           <input type="hidden" class="planKey" th:value="${board.publicKey}">
-                          <td><input type="checkbox" class="trChkBox"></td>
+                          <!--<td><input type="checkbox" class="trChkBox"></td>-->
+                          <td th:text="${cnt.count}"></td>
                           <td align="left" th:text="${board.title}"></td>
+                          <td th:text="${board.fileCnt eq null?'파일 없음':#strings.concat(board.fileCnt,' 건')}"></td>
+                          <td th:text="${board.commentCnt eq null?'0':board.commentCnt}"></td>
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                             <td th:if="${board.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
@@ -92,8 +95,6 @@
                           </th:block>
                           <td th:text="${board.wrtUserNm}"></td>
                           <td th:text="${#temporals.format(board.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                          <td th:text="${board.fileCnt eq null?'파일 없음':#strings.concat(board.fileCnt,' 건')}"></td>
-                          <td th:text="${board.commentCnt eq null?'0':board.commentCnt}"></td>
                         </tr>
                         </tbody>
                       </table>
diff --git a/src/main/resources/templates/publicBoard/board/boardViewModal.html b/src/main/resources/templates/publicBoard/board/boardViewModal.html
index a26d8e32..82034f67 100644
--- a/src/main/resources/templates/publicBoard/board/boardViewModal.html
+++ b/src/main/resources/templates/publicBoard/board/boardViewModal.html
@@ -165,5 +165,7 @@
   <th:block th:if="${userSeq eq info.wrtUserSeq}"><!--작성자일 경우 수정 허용-->
     <button type="button" class="btn btn-warning" id="editBtn">수정</button>
   </th:block>
+<!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/publicBoard/notice/noticeEditModal.html b/src/main/resources/templates/publicBoard/notice/noticeEditModal.html
index 8b18ae45..c0fe555c 100644
--- a/src/main/resources/templates/publicBoard/notice/noticeEditModal.html
+++ b/src/main/resources/templates/publicBoard/notice/noticeEditModal.html
@@ -67,6 +67,8 @@
   </form>
 </div>
 <div class="modal-footer bg-light">
+<!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   <button type="button" class="btn btn-primary" id="saveBtn">저장</button>
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/publicBoard/notice/noticePage.html b/src/main/resources/templates/publicBoard/notice/noticePage.html
index 9c74d7f4..499492e4 100644
--- a/src/main/resources/templates/publicBoard/notice/noticePage.html
+++ b/src/main/resources/templates/publicBoard/notice/noticePage.html
@@ -68,22 +68,27 @@
                       <table class="table table-sm table-hover table-bordered">
                         <thead>
                         <tr class="table-color">
-                          <th></th>
+                          <th>순번</th>
                           <th>제목</th>
+                          <th>첨부파일</th>
+                          <th>댓글</th>
                           <th>관서</th>
                           <th>부서</th>
                           <th>계급</th>
                           <th>작성자</th>
                           <th>작성일시</th>
-                          <th>첨부파일</th>
-                          <th>댓글</th>
                         </tr>
                         </thead>
                         <tbody class="table-group-divider">
-                        <tr class="noticeTr" th:each="notice:${noticeList}">
+                        <tr class="noticeTr" th:each="notice,cnt:${noticeList}">
                           <input type="hidden" class="publicKey" th:value="${notice.publicKey}">
+<!--
                           <td><input type="checkbox" class="trChkBox"></td>
+-->
+                          <td th:text="${cnt.count}"></td>
                           <td align="left" th:text="${notice.title}"></td>
+                          <td th:text="${notice.fileCnt eq null?'파일 없음':#strings.concat(notice.fileCnt,' 건')}"></td>
+                          <td th:text="${notice.commentCnt eq null?'0':notice.commentCnt}"></td>
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                             <td th:if="${notice.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
@@ -95,8 +100,6 @@
                           </th:block>
                           <td th:text="${notice.wrtUserNm}"></td>
                           <td th:text="${#temporals.format(notice.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                          <td th:text="${notice.fileCnt eq null?'파일 없음':#strings.concat(notice.fileCnt,' 건')}"></td>
-                          <td th:text="${notice.commentCnt eq null?'0':notice.commentCnt}"></td>
                         </tr>
                         </tbody>
                       </table>
diff --git a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html
index 8f5d532b..cbc1f0bf 100644
--- a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html
+++ b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html
@@ -165,5 +165,7 @@
   <th:block th:if="${userSeq eq info.wrtUserSeq}"><!--작성자일 경우 수정 허용-->
     <button type="button" class="btn btn-warning" id="editBtn">수정</button>
   </th:block>
+<!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/publicBoard/qna/qnaPage.html b/src/main/resources/templates/publicBoard/qna/qnaPage.html
index 47655cfb..96c03c2e 100644
--- a/src/main/resources/templates/publicBoard/qna/qnaPage.html
+++ b/src/main/resources/templates/publicBoard/qna/qnaPage.html
@@ -66,22 +66,25 @@
                       <table class="table table-sm table-hover table-bordered">
                         <thead>
                         <tr class="table-color">
-                          <th></th>
+                          <th>순번</th>
                           <th>제목</th>
+                          <th>첨부파일</th>
+                          <th>댓글</th>
                           <th>관서</th>
                           <th>부서</th>
                           <th>계급</th>
                           <th>작성자</th>
                           <th>작성일시</th>
-                          <th>첨부파일</th>
-                          <th>댓글</th>
                         </tr>
                         </thead>
                         <tbody class="table-group-divider">
-                        <tr class="planTr"  th:each="qna:${qnaList}">
+                        <tr class="planTr"  th:each="qna,cnt:${qnaList}">
                           <input type="hidden" class="planKey" th:value="${qna.publicKey}">
-                          <td><input type="checkbox" class="trChkBox"></td>
+                          <!--<td><input type="checkbox" class="trChkBox"></td>-->
+                          <td th:text="${cnt.count}"></td>
                           <td align="left" th:text="${qna.title}"></td>
+                          <td th:text="${qna.fileCnt eq null?'파일 없음':#strings.concat(qna.fileCnt,' 건')}"></td>
+                          <td th:text="${qna.commentCnt eq null?'0':qna.commentCnt}"></td>
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                             <td th:if="${qna.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
@@ -93,8 +96,6 @@
                           </th:block>
                           <td th:text="${qna.wrtUserNm}"></td>
                           <td th:text="${#temporals.format(qna.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                          <td th:text="${qna.fileCnt eq null?'파일 없음':#strings.concat(qna.fileCnt,' 건')}"></td>
-                          <td th:text="${qna.commentCnt eq null?'0':qna.commentCnt}"></td>
                         </tr>
                         </tbody>
                       </table>
diff --git a/src/main/resources/templates/publicBoard/reference/referenceEditModal.html b/src/main/resources/templates/publicBoard/reference/referenceEditModal.html
index cc723187..f33982f2 100644
--- a/src/main/resources/templates/publicBoard/reference/referenceEditModal.html
+++ b/src/main/resources/templates/publicBoard/reference/referenceEditModal.html
@@ -85,6 +85,8 @@
   </form>
 </div>
 <div class="modal-footer bg-light">
+<!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   <button type="button" class="btn btn-primary" id="saveBtn">저장</button>
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/publicBoard/reference/referencePage.html b/src/main/resources/templates/publicBoard/reference/referencePage.html
index 053a4977..df9ba9af 100644
--- a/src/main/resources/templates/publicBoard/reference/referencePage.html
+++ b/src/main/resources/templates/publicBoard/reference/referencePage.html
@@ -71,21 +71,24 @@
                 <table class="table table-sm table-hover table-bordered">
                   <thead>
                   <tr class="table-color">
-                    <th></th>
+                    <th>순번</th>
                     <th>제목</th>
+                    <th>첨부파일</th>
+                    <th>댓글</th>
                     <th>관서</th>
                     <th>부서</th>
                     <th>계급</th>
                     <th>작성자</th>
                     <th>작성일시</th>
-                    <th>첨부파일</th>
-                    <th>댓글</th>
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
-                  <tr class="planTr" th:each="reference:${referenceList}">
+                  <tr class="planTr" th:each="reference,cnt:${referenceList}">
                     <input type="hidden" class="planKey" th:value="${reference.publicKey}">
+<!--
                     <td><input type="checkbox" class="trChkBox"></td>
+-->
+                    <td th:text="${cnt.count}"></td>
                     <td align="left" th:text="${reference.title}"></td>
                     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                       <td th:if="${reference.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
diff --git a/src/main/resources/templates/publicBoard/reference/referenceViewModal.html b/src/main/resources/templates/publicBoard/reference/referenceViewModal.html
index 57714dab..05ed67fa 100644
--- a/src/main/resources/templates/publicBoard/reference/referenceViewModal.html
+++ b/src/main/resources/templates/publicBoard/reference/referenceViewModal.html
@@ -171,5 +171,7 @@
   <th:block th:if="${userSeq eq info.wrtUserSeq}"><!--작성자일 경우 수정 허용-->
     <button type="button" class="btn btn-warning" id="editBtn">수정</button>
   </th:block>
+<!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 </div>
\ No newline at end of file