외사정보보고 수사관리 목록 순서 정렬

src/main/resources/static/css/common.css

@@ -214,3 +214,7 @@
   top: 0px;
 
 }
+
+.titleLeft {
+  text-align: left !important;
+}

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>
-                    <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:if="${searchParams.status ne 'receive'}">상태</th>
-                    <th>열람수</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')}">
+                    <td th:text="${cnt.count}"></td>
-                        <th:text th:if="${commonCode.itemCd eq faRpt.status}" th:text="${commonCode.itemValue}"></th:text>
+                    <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>
                     <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 class="titleLeft" th:text="${faRpt.title}"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                    <td th:text="${faRpt.fileCnt eq null?'파일 없음':#strings.concat(faRpt.fileCnt,' 건')}"></td>
-                      <td th:if="${faRpt.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                    <td th:text="|${faRpt.readCnt}/${faRpt.userCnt}|"></td>
-                    </th:block>
                     <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:if="${faRpt.status ne 'receive'}">
-                    <td th:text="|${faRpt.readCnt}/${faRpt.userCnt}|"></td>
+                      <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>

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>

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>

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>

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>

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>

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>

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>