From 199fc8e79bee7e4e09e8c3fffb32612454ca6a50 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Sat, 28 Jan 2023 14:16:45 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=A0=95=EB=B3=B4=EB=B3=B4?=
 =?UTF-8?q?=EA=B3=A0=20=EC=88=98=EC=82=AC=EA=B4=80=EB=A6=AC=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

---
 src/main/resources/static/css/common.css      |  4 ++
 .../resources/templates/faRpt/faRptBoard.html | 43 +++++++++++--------
 .../templates/faRpt/faRptEditModal.html       |  2 +
 .../templates/faRpt/faRptViewModal.html       |  2 +
 src/main/resources/templates/ivsgt/ivsgt.html |  6 ++-
 .../majorStatus/majorStatusEditModal.html     |  4 +-
 .../ivsgt/majorStatus/majorStatusPage.html    |  6 +--
 .../majorStatus/majorStatusViewModal.html     |  4 +-
 .../publicBoard/reference/referencePage.html  |  4 +-
 9 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css
index 93304453..07788d43 100644
--- a/src/main/resources/static/css/common.css
+++ b/src/main/resources/static/css/common.css
@@ -214,3 +214,7 @@
   top: 0px;
 
 }
+
+.titleLeft {
+  text-align: left !important;
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/faRpt/faRptBoard.html b/src/main/resources/templates/faRpt/faRptBoard.html
index 3a9fa9d7..a40fbb51 100644
--- a/src/main/resources/templates/faRpt/faRptBoard.html
+++ b/src/main/resources/templates/faRpt/faRptBoard.html
@@ -87,43 +87,46 @@
                 <table class="table table-sm table-bordered table-hover">
                   <thead>
                   <tr class="table-secondary">
-                    <th></th>
-                    <th th:if="${searchParams.status ne 'receive'}">상태</th>
+                    <th>순번</th>
+                    <th>관서</th>
                     <th>분류</th>
                     <th>제목</th>
-                    <th>관서</th>
+                    <th>첨부파일</th>
+                    <th>열람수</th>
                     <th>부서</th>
                     <th>작성자</th>
                     <th>작성일시</th>
-                    <th>첨부파일</th>
-                    <th>열람수</th>
+                    <th th:if="${searchParams.status ne 'receive'}">상태</th>
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
-                  <tr class="faRptTr" th:each="faRpt:${faRptList}">
+                  <tr class="faRptTr" th:each="faRpt,cnt:${faRptList}">
                     <input type="hidden" class="faRptKey" th:value="${faRpt.faRptKey}">
+<!--
                     <td><input type="checkbox" class="trChkBox"></td>
-                    <td th:if="${faRpt.status ne 'receive'}">
-                      <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-                        <th:text th:if="${commonCode.itemCd eq faRpt.status}" th:text="${commonCode.itemValue}"></th:text>
-                      </th:block>
-                    </td>
-                    <td>
-                      <th:block th:each="commonCode:${session.commonCode.get('FRC')}">
-                        <th:text th:if="${commonCode.itemCd eq faRpt.faRptType}" th:text="${commonCode.itemValue}"></th:text>
-                      </th:block>
-                    </td>
-                    <td th:text="${faRpt.title}"></td>
+-->
+                    <td th:text="${cnt.count}"></td>
                     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                       <td th:if="${faRpt.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                     </th:block>
+                    <td>
+                    <th:block th:each="commonCode:${session.commonCode.get('FRC')}">
+                    <th:text th:if="${commonCode.itemCd eq faRpt.faRptType}" th:text="${commonCode.itemValue}"></th:text>
+                    </th:block>
+                    </td>
+                    <td class="titleLeft" th:text="${faRpt.title}"></td>
+                    <td th:text="${faRpt.fileCnt eq null?'파일 없음':#strings.concat(faRpt.fileCnt,' 건')}"></td>
+                    <td th:text="|${faRpt.readCnt}/${faRpt.userCnt}|"></td>
                     <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
                       <td th:if="${faRpt.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                     </th:block>
                     <td th:text="${faRpt.wrtUserNm}"></td>
                     <td th:text="${#temporals.format(faRpt.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                    <td th:text="${faRpt.fileCnt eq null?'파일 없음':#strings.concat(faRpt.fileCnt,' 건')}"></td>
-                    <td th:text="|${faRpt.readCnt}/${faRpt.userCnt}|"></td>
+                    <td th:if="${faRpt.status ne 'receive'}">
+                      <th:block th:each="commonCode:${session.commonCode.get('DST')}">
+                        <th:text th:if="${commonCode.itemCd eq faRpt.status}" th:text="${commonCode.itemValue}"></th:text>
+                      </th:block>
+                    </td>
                   </tr>
                   </tbody>
                 </table>
@@ -200,7 +203,9 @@
         </div>
         <div class="modal-footer bg-light">
           <button type="button" class="btn btn-primary" id="getMenuBtn">추가</button>
+<!--
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
         </div>
       </div>
     </div>
diff --git a/src/main/resources/templates/faRpt/faRptEditModal.html b/src/main/resources/templates/faRpt/faRptEditModal.html
index cf9c507a..e5b6172c 100644
--- a/src/main/resources/templates/faRpt/faRptEditModal.html
+++ b/src/main/resources/templates/faRpt/faRptEditModal.html
@@ -123,7 +123,9 @@
   </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-warning" id="saveTempBtn">임시저장</button>
   <button type="button" class="btn btn-primary" id="saveFaRptBtn">송신</button>
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/faRpt/faRptViewModal.html b/src/main/resources/templates/faRpt/faRptViewModal.html
index bbe7608d..6c6bd4eb 100644
--- a/src/main/resources/templates/faRpt/faRptViewModal.html
+++ b/src/main/resources/templates/faRpt/faRptViewModal.html
@@ -119,5 +119,7 @@
   <th:block th:if="${userSeq ne faRpt.wrtUserSeq}">
     <button type="button" class="btn btn-success" id="reSendBtn" th:data-farptkey="${faRpt.faRptKey}">회신</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/ivsgt/ivsgt.html b/src/main/resources/templates/ivsgt/ivsgt.html
index 288a2053..75155fd1 100644
--- a/src/main/resources/templates/ivsgt/ivsgt.html
+++ b/src/main/resources/templates/ivsgt/ivsgt.html
@@ -118,6 +118,7 @@
                   <thead class="align-middle text-center">
                   <tr class="table-secondary">
                     <!--<th>문서번호</th>-->
+                    <th>순번</th>
                     <th>관서</th>
                     <th>검거유형1</th>
                     <th>검거유형2</th>
@@ -127,14 +128,15 @@
                   </tr>
                   </thead>
                   <tbody class="table-group-divider align-middle text-center">
-                  <tr class="tr" th:each="boardInvestigation:${boardInvestigationList}" th:data-key="${boardInvestigation.ivsgtKey}">
+                  <tr class="tr" th:each="boardInvestigation,cnt:${boardInvestigationList}" th:data-key="${boardInvestigation.ivsgtKey}">
                     <!--<td th:text="${boardInvestigation.ivsgtKey}"></td>-->
+                    <td th:text="${cnt.count}"></td>
                     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                       <td th:if="${boardInvestigation.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                     </th:block>
                     <td th:text="${boardInvestigation.arrestCdName}"></td>
                     <td th:text="${boardInvestigation.arrestCd2Name}"></td>
-                    <td th:text="${boardInvestigation.contentStatus == 'Y' ? '[임시저장]' : ''} + ${boardInvestigation.contentTitle}"></td>
+                    <td class="titleLeft" th:text="${boardInvestigation.contentStatus == 'Y' ? '[임시저장]' : ''} + ${boardInvestigation.contentTitle}"></td>
                     <td th:text="${boardInvestigation.wrtNm}"></td>
                     <td th:text="${#temporals.format(boardInvestigation.wrtDt, 'yyyy-MM-dd')}"></td>
                   </tr>
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
index b78fa1de..ebaebffb 100644
--- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
+++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
@@ -27,7 +27,7 @@
             <div class="col-sm-2">
                 <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(majorStatus.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
             </div>
-            <label for="majorType" class="col-sm-2 col-form-label col-form-label-sm text-center">종류</label>
+            <label for="majorType" class="col-sm-2 col-form-label col-form-label-sm text-center">분류</label>
             <div class="col-sm-2">
                 <select class="form-select form-select-sm" id="majorType" name="majorType">
                     <option value="">선택해주세요.</option>
@@ -75,6 +75,8 @@
 </div>
 <div class="modal-footer bg-light">
     <button type="button" class="btn btn-warning" id="saveTempBtn" data-contentStatus="DST001">임시저장</button>
+<!--
     <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/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
index 26b33a36..7be80f60 100644
--- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
+++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
@@ -69,24 +69,24 @@
                         <thead>
                         <tr class="table-secondary">
                           <th width="5%">순번</th>
-                          <th width="10%">작성일시</th>
-                          <th width="10%">종류</th>
+                          <th width="10%">분류</th>
                           <th>제목</th>
                           <th>내용</th>
                           <th width="10%">첨부파일</th>
+                          <th width="10%">작성일시</th>
                         </tr>
                         </thead>
                         <tbody class="table-group-divider">
                         <tr class="tr" th:each="major, cnt:${majorList}">
                           <input type="hidden" class="majorKey" th:value="${major.majorKey}">
                           <td th:text="${cnt.count}"></td>
-                          <td th:text="${#temporals.format(major.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                           <th:block th:each="commonCode:${session.commonCode.get('MST')}">
                             <td th:if="${major.majorType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
                           <td th:text="|${major.contentStatus eq 'DST001'?'[임시]':''}${major.contentTitle}|"></td>
                           <td th:utext="${major.contentInfo}"></td>
                           <td th:text="${major.fileCnt eq null?'파일 없음':#strings.concat(major.fileCnt,' 건')}"></td>
+                          <td th:text="${#temporals.format(major.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                         </tr>
                         </tbody>
                       </table>
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html
index 9631964f..dcf17b17 100644
--- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html
+++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html
@@ -76,6 +76,8 @@
     <th:block th:if="${userSeq eq majorStatus.wrtUserSeq}"><!--작성자일 경우 수정 허용-->
         <button type="button" class="btn btn-warning" id="editBtn" th:data-majorkey="${majorStatus.majorKey}">수정</button>
     </th:block>
-    <button type="button" class="btn btn-danger" id="deleteMajorBtn">삭제</button>
+    <button type="button" class="btn btn-danger float-start" id="deleteMajorBtn">삭제</button>
+<!--
     <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/reference/referencePage.html b/src/main/resources/templates/publicBoard/reference/referencePage.html
index df9ba9af..4a030db1 100644
--- a/src/main/resources/templates/publicBoard/reference/referencePage.html
+++ b/src/main/resources/templates/publicBoard/reference/referencePage.html
@@ -90,6 +90,8 @@
 -->
                     <td th:text="${cnt.count}"></td>
                     <td align="left" th:text="${reference.title}"></td>
+                    <td th:text="${reference.fileCnt eq null?'파일 없음':#strings.concat(reference.fileCnt,' 건')}"></td>
+                    <td th:text="${reference.commentCnt eq null?'0':reference.commentCnt}"></td>
                     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                       <td th:if="${reference.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                     </th:block>
@@ -101,8 +103,6 @@
                     </th:block>
                     <td th:text="${reference.wrtUserNm}"></td>
                     <td th:text="${#temporals.format(reference.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                    <td th:text="${reference.fileCnt eq null?'파일 없음':#strings.concat(reference.fileCnt,' 건')}"></td>
-                    <td th:text="${reference.commentCnt eq null?'0':reference.commentCnt}"></td>
                   </tr>
                   </tbody>
                 </table>