From 2b909073ca21e9cede61870cd84eb72f6ef68085 Mon Sep 17 00:00:00 2001
From: "DESKTOP-QGC5RJO\\DBNT" <yrseo@dbnt.co.kr>
Date: Fri, 27 Jan 2023 14:08:27 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=A9=EC=B2=A9=EA=B3=B5=EC=9E=91,=EB=B0=A9?=
 =?UTF-8?q?=EC=B2=A9=ED=99=9C=EB=8F=99=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ciWork/ciWorkBoard.html                   | 45 ++++++++++---------
 .../counterIntelligence/ciaEduList.html       |  8 ++--
 .../counterIntelligence/ciaForeignerList.html |  8 ++--
 .../ciaManageCompanyList.html                 | 11 +++--
 .../ciaSaftyDemandList.html                   |  8 ++--
 5 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/templates/counterIntelligence/ciWork/ciWorkBoard.html b/src/main/resources/templates/counterIntelligence/ciWork/ciWorkBoard.html
index 023170de..2a920082 100644
--- a/src/main/resources/templates/counterIntelligence/ciWork/ciWorkBoard.html
+++ b/src/main/resources/templates/counterIntelligence/ciWork/ciWorkBoard.html
@@ -100,50 +100,51 @@
                 <table class="table table-sm table-bordered table-hover">
                   <thead>
                   <tr class="table-secondary">
-                    <th>등급</th>
-                    <th>공작명</th>
-                    <th>착수일<br>/종결일</th>
+                    <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>
+
+
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
-                  <tr class="ciWorkTr" th:each="ciWork:${ciWorkList}">
+                  <tr class="ciWorkTr" th:each="ciWork,cnt:${ciWorkList}">
                     <input type="hidden" class="ciwKey" th:value="${ciWork.ciwKey}">
+                    <td th:text="${cnt.count}"></td>
+                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                      <td th:if="${ciWork.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                    </th:block>
+                    <td>
+                      <th:block th:if="${ciWork.status eq 'DST001'}">[임시]</th:block>
+                      <th:block th:text="${ciWork.title}"></th:block>
+                    </td>
                     <td>
                       <th:block th:each="code:${session.commonCode.get('CIWR')}">
                         <th:block th:if="${code.itemCd eq ciWork.workRating}" th:text="${code.itemValue}"></th:block>
                       </th:block>
                     </td>
-                    <td>
-                      <th:block th:if="${ciWork.status eq 'DST001'}">[임시]</th:block>
-                      <th:block th:text="${ciWork.title}"></th:block>
-                    </td>
                     <td>
                       <div th:text="${ciWork.workStartDate}"></div>
                       <div th:text="${#strings.concat('~ ', ciWork.workEndDate)}"></div>
                     </td>
-                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                      <td th:if="${ciWork.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
-                    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                      <td th:if="${ciWork.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
+                    <td>
+                      <div th:text="|1차: ${ciWork.reRatingDate1}|"></div>
+                      <div th:text="|2차: ${ciWork.reRatingDate2}|"></div>
+                    </td>
+                    <td th:text="${ciWork.fileCnt eq null?'파일 없음':#strings.concat(ciWork.fileCnt,' 건')}"></td>
                     <td>
                       <th:block th:each="code:${session.commonCode.get('JT')}">
                         <th:block th:if="${code.itemCd eq ciWork.wrtUserGrd}" th:text="|${code.itemValue} ${ciWork.wrtUserNm}|"></th:block>
                       </th:block>
                     </td>
                     <td th:text="${#temporals.format(ciWork.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                    <td th:text="${ciWork.fileCnt eq null?'파일 없음':#strings.concat(ciWork.fileCnt,' 건')}"></td>
-                    <td>
-                      <div th:text="|1차: ${ciWork.reRatingDate1}|"></div>
-                      <div th:text="|2차: ${ciWork.reRatingDate2}|"></div>
-                    </td>
                   </tr>
                   </tbody>
                 </table>
diff --git a/src/main/resources/templates/counterIntelligence/ciaEduList.html b/src/main/resources/templates/counterIntelligence/ciaEduList.html
index 946f8cd1..1db539a2 100644
--- a/src/main/resources/templates/counterIntelligence/ciaEduList.html
+++ b/src/main/resources/templates/counterIntelligence/ciaEduList.html
@@ -73,24 +73,26 @@
                 <table class="table table-sm table-bordered table-hover" id="ciaEduTb">
                   <thead>
                   <tr class="table-secondary">
-                    <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="eiTr" th:each="list:${eiList}">
-                    <td th:text="${list.contentStatus}"></td>
+                  <tr class="eiTr" th:each="list,cnt:${eiList}">
+                    <td th:text="${cnt.count}"></td>
                   	<td th:text="${list.eduDate}"></td>
                   	<td th:text="${list.mgtOrgan}"></td>
                   	<td th:text="${list.eduType}"></td>
                   	<td th:text="${list.peopleCnt}"></td>
                   	<td th:utext="${list.description}"></td>
+                    <td th:text="${list.contentStatus}"></td>
                   	<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
                   	<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                   	<th:block>
diff --git a/src/main/resources/templates/counterIntelligence/ciaForeignerList.html b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html
index 10baac64..2dcaa368 100644
--- a/src/main/resources/templates/counterIntelligence/ciaForeignerList.html
+++ b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html
@@ -76,13 +76,14 @@
                 <table class="table table-sm table-bordered table-hover" id="ciaForeignerTb">
                   <thead>
                   <tr class="table-secondary">
-                    <th rowspan="2">상태</th>
+                    <th rowspan="2">순번</th>
                     <th rowspan="2">관리관서</th>
                     <th rowspan="2">담당관</th>
                     <th colspan="3">대상커뮤니티</th>
                     <th rowspan="2">선정사유</th>
                     <th rowspan="2">모니터링 사항</th>
                     <th rowspan="2">선정일</th>
+                    <th rowspan="2">상태</th>
                     <th rowspan="2">작성자</th>
                     <th rowspan="2">작성일</th>
                   </tr>
@@ -93,8 +94,8 @@
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
-                  <tr class="fiTr" th:each="list:${fiList}">
-                    <td th:text="${list.contentStatus}"></td>
+                  <tr class="fiTr" th:each="list,cnt:${fiList}">
+                    <td th:text="${cnt.count}"></td>
                   	<td th:text="${list.mgtOrgan}"></td>
                   	<td th:text="${list.manager}"></td>
                   	<td th:text="${list.commuLocation}"></td>
@@ -103,6 +104,7 @@
                   	<td th:utext="${list.selectReason}"></td>
                   	<td th:utext="${list.monitoringInfo}"></td>
                   	<td th:text="${list.fixDate}"></td>
+                    <td th:text="${list.contentStatus}"></td>
                   	<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
                   	<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td> 
                   	<th:block>
diff --git a/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html
index a10a6847..d3a720b7 100644
--- a/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html
+++ b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html
@@ -73,20 +73,22 @@
                 <table class="table table-sm table-bordered table-hover" id="mciTb">
                   <thead>
                   <tr class="table-secondary">
-                    <th>상태</th>
-                    <th>관리관서</th>
+                    <th>순번</th>
+                    <th>관서</th>
+
                     <th>업체명</th>
                     <th>소재지</th>
                     <th>관련<br>분야</th>
                     <th>특이사항</th>
                     <th>연락처<br>(부서,이름)</th>
+                    <th>상태</th>
                     <th>작성자</th>
                     <th>작성일</th>
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
-                  <tr class="mciTr" th:each="list:${mciList}">
-                    <td th:text="${list.contentStatus}"></td>
+                  <tr class="mciTr" th:each="list,cnt:${mciList}">
+                    <td th:text="${cnt.count}"></td>
                     <td th:text="${list.mgtOrgan}"></td>
                     <td th:text="${list.companyNm}"></td>
                     <td th:text="${list.companyLocation}"></td>
@@ -97,6 +99,7 @@
                     	<br>
                     	([[${list.department}]] [[${list.name}]])
                     </td>
+                    <td th:text="${list.contentStatus}"></td>
                     <td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
                     <td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                     <th:block>
diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html
index 6a73121d..ca19f853 100644
--- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html
+++ b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html
@@ -70,17 +70,18 @@
                 <table class="table table-sm table-bordered table-hover" id="sdiTb">
                   <thead>
                   <tr class="table-secondary">
-                  	<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="sdiTr" th:each="list:${sdiList}">
-                  	<td th:text="${list.contentStatus}"></td>
+                  <tr class="sdiTr" th:each="list ,cnt:${sdiList}">
+                    <td th:text="${cnt.count}"></td>
                     <td th:text="${list.wrtOrgan}"></td>
                     <td>
                     	<th:block th:if="${#strings.length(list.localInfo)>35}" th:utext="|${#strings.substring(list.localInfo, 0, 35)}...|"></th:block>
@@ -90,6 +91,7 @@
                     	<th:block th:if="${#strings.length(list.outlookProblem)>35}" th:utext="|${#strings.substring(list.outlookProblem, 0, 35)}...|"></th:block>
                         <th:block th:unless="${#strings.length(list.outlookProblem)>35}" th:utext="${list.outlookProblem}"></th:block>
                     </td>
+                    <td th:text="${list.contentStatus}"></td>
                     <td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
                     <td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                     <th:block>