From efa04a0618c6475f7a57e4b866d0d3817a6a54a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 30 Jan 2023 10:21:17 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20=EC=A7=81=EC=B1=85=20=EC=A0=95=EB=B3=B4=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../police/police/policeEditModal.html        | 11 ++++++
 .../templates/police/police/policeList.html   | 38 ++++++++++---------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/templates/police/police/policeEditModal.html b/src/main/resources/templates/police/police/policeEditModal.html
index 07ced379..51294f1b 100644
--- a/src/main/resources/templates/police/police/policeEditModal.html
+++ b/src/main/resources/templates/police/police/policeEditModal.html
@@ -110,6 +110,17 @@
         <input type="text" class="form-control form-control-sm dateSelector" id="titleInDate" name="titleInDate" th:value="${userInfo.titleInDate}" readonly>
       </div>
     </div>
+    <div class="row mb-1">
+      <label for="outturnCd" class="col-sm-2 col-form-label col-form-label-sm text-center">직책</label>
+      <div class="col-sm-4">
+        <select class="form-select form-select-sm" id="dutyCd" name="dutyCd">
+          <option value="">--선택--</option>
+          <th:block th:each="code:${session.commonCode.get('DT')}">
+            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.dutyCd}"></option>
+          </th:block>
+        </select>
+      </div>
+    </div>
     <div class="row mb-1">
       <label for="outturnCd" class="col-sm-2 col-form-label col-form-label-sm text-center">경과</label>
       <div class="col-sm-4">
diff --git a/src/main/resources/templates/police/police/policeList.html b/src/main/resources/templates/police/police/policeList.html
index 693d9708..58e28876 100644
--- a/src/main/resources/templates/police/police/policeList.html
+++ b/src/main/resources/templates/police/police/policeList.html
@@ -118,27 +118,31 @@
                       </tr>
                       </thead>
                       <tbody class="table-group-divider">
-                      <tr class="policeTr" th:each="list:${policeList}">
+                      <tr class="policeTr" th:each="police:${policeList}">
                         <th:block>
-                          <input type="hidden" class="userSeq" th:value="${list.userSeq}">
+                          <input type="hidden" class="userSeq" th:value="${police.userSeq}">
                         </th:block>
-                        <td th:text="${list.rownum}"></td>
-                        <td th:text="${list.organNm}"></td>
-                        <td th:text="${list.ofcCd}"></td>
-                        <td></td>
-                        <td th:text="${list.titleCd}"></td>
-                        <td th:text="${list.userNm}"></td>
-                        <td th:text="${list.birthDate}"></td>
-                        <td th:text="${list.sex}"></td>
-                        <td th:text="${list.policeInDate}"></td>
-                        <td th:text="${list.titleInDate}"></td>
-                        <td th:text="${list.ofcInDate}"></td>
+                        <td th:text="${police.rownum}"></td>
+                        <td th:text="${police.organNm}"></td>
+                        <td th:text="${police.ofcCd}"></td>
+                        <td>
+                          <th:block th:each="code:${session.commonCode.get('DT')}">
+                            <th:block th:if="${code.itemCd eq police.dutyCd}" th:text="${code.itemValue}"></th:block>
+                          </th:block>
+                        </td>
+                        <td th:text="${police.titleCd}"></td>
+                        <td th:text="${police.userNm}"></td>
+                        <td th:text="${police.birthDate}"></td>
+                        <td th:text="${police.sex}"></td>
+                        <td th:text="${police.policeInDate}"></td>
+                        <td th:text="${police.titleInDate}"></td>
+                        <td th:text="${police.ofcInDate}"></td>
 <!--                        <td th:text="${list.outturnCd}"></td>-->
-                        <td th:if="${list.outturnCd == '수사'}">O</td>
-                        <td th:if="${list.outturnCd != '수사'}">X</td>
+                        <td th:if="${police.outturnCd == '수사'}">O</td>
+                        <td th:if="${police.outturnCd != '수사'}">X</td>
                         <td></td>
-                        <td th:text="${list.jobInCd}"></td>
-                        <td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                        <td th:text="${police.jobInCd}"></td>
+                        <td th:text="${#temporals.format(police.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                         <th:block th:if="${userStatus eq 'USC003'} and ${accessAuth eq 'ACC003'}">
                           <td class="checkBoxTd"><input type="checkbox" name="policeChk" class="policeCheckBox"></td>
                         </th:block>