From 6ab6a43f55fbbe74cd72d93b710a72728e6aa422 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: Sat, 28 Jan 2023 14:59:33 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=BD=EB=A0=A5=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=EC=A7=81=EC=B1=85=20=EC=B6=94=EA=B0=80.=20=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=ED=98=84=ED=99=A9=20=EC=A7=81=EC=B1=85=20=EC=B6=94=EA=B0=80.?=
 =?UTF-8?q?=20=EA=B5=90=EC=9C=A1=ED=98=84=ED=99=A9=20=EC=B5=9C=EC=A2=85?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=9D=BC=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../faisp/main/userInfo/model/UserInfo.java   |  5 +++-
 .../mybatisMapper/UserInfoMapper.xml          | 24 +++++++++++------
 .../templates/police/career/careerMgt.html    |  8 ++++--
 .../police/education/educationMgt.html        | 27 ++++++++++---------
 4 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java
index 0ccbdcc4..2b1e0c84 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java
@@ -128,7 +128,10 @@ public class UserInfo extends BaseModel implements UserDetails{
   private Integer crc006Sum;
   @Transient
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-  private LocalDateTime lastWrtDt;
+  private LocalDateTime lastCareerWrtDt;
+  @Transient
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime lastEduWrtDt;
 
   @Transient
   private List<AccessConfig> accessConfigList;
diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index 1c5cb9a5..b2b70290 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -123,6 +123,7 @@
            police_in_date,
            title_in_date,
            ofc_in_date,
+           duty_cd,
            (select item_value from code_mgt where item_cd = outturn_cd) as outturn_cd,
            (select item_value from code_mgt where item_cd = job_in_cd) as job_in_cd,
            wrt_dt,
@@ -132,20 +133,27 @@
            b.crc004Sum,
            b.crc005Sum,
            b.crc006Sum,
-           b.lastWrtDt
+           b.lastCareerWrtDt,
+           c.lastEduWrtDt
 	from user_info a
     left outer join (
       select user_seq,
-        sum(case when career_cd = 'CRC001' then work_month else 0 end) as crc001Sum,
-        sum(case when career_cd = 'CRC002' then work_month else 0 end) as crc002Sum,
-        sum(case when career_cd = 'CRC003' then work_month else 0 end) as crc003Sum,
-        sum(case when career_cd = 'CRC004' then work_month else 0 end) as crc004Sum,
-        sum(case when career_cd = 'CRC005' then work_month else 0 end) as crc005Sum,
-        sum(case when career_cd = 'CRC006' then work_month else 0 end) as crc006Sum,
-             max(wrt_dt) as lastWrtDt
+             sum(case when career_cd = 'CRC001' then work_month else 0 end) as crc001Sum,
+             sum(case when career_cd = 'CRC002' then work_month else 0 end) as crc002Sum,
+             sum(case when career_cd = 'CRC003' then work_month else 0 end) as crc003Sum,
+             sum(case when career_cd = 'CRC004' then work_month else 0 end) as crc004Sum,
+             sum(case when career_cd = 'CRC005' then work_month else 0 end) as crc005Sum,
+             sum(case when career_cd = 'CRC006' then work_month else 0 end) as crc006Sum,
+             max(wrt_dt) as lastCareerWrtDt
       from user_career
       group by user_seq
     ) b on a.user_seq = b.user_seq
+    left outer join (
+      select user_seq,
+             max(wrt_dt) as lastEduWrtDt
+      from user_edu
+      group by user_seq
+    ) c on a.user_seq = c.user_seq
     <include refid="selectPoliceListWhere"></include>
     order by rownum desc
     <if test='excel != "Y"'>
diff --git a/src/main/resources/templates/police/career/careerMgt.html b/src/main/resources/templates/police/career/careerMgt.html
index aebdfd24..bf3d320e 100644
--- a/src/main/resources/templates/police/career/careerMgt.html
+++ b/src/main/resources/templates/police/career/careerMgt.html
@@ -102,7 +102,11 @@
                         <td th:text="${police.rownum}"></td>
                         <td th:text="${police.organNm}"></td>
                         <td th:text="${police.ofcCd}"></td>
-                        <td></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>
@@ -157,7 +161,7 @@
                             </th:block>
                           </th:block>
                         </td>
-                        <td th:text="${#temporals.format(police.lastWrtDt, 'yyyy-MM-dd')}"></td>
+                        <td th:text="${#temporals.format(police.lastCareerWrtDt, 'yyyy-MM-dd')}"></td>
                       </tr>
                       </tbody>
                     </table>
diff --git a/src/main/resources/templates/police/education/educationMgt.html b/src/main/resources/templates/police/education/educationMgt.html
index 37fe14fd..d0af3bda 100644
--- a/src/main/resources/templates/police/education/educationMgt.html
+++ b/src/main/resources/templates/police/education/educationMgt.html
@@ -87,27 +87,30 @@
                         <th>직책</th>
                         <th>계급</th>
                         <th>성명</th>
-
                         <th>생년월일</th>
                         <th>성별</th>
                         <th>최종수정일</th>
                       </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="${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="${#temporals.format(list.lastWrtDt, 'yyyy-MM-dd')}"></td>
+                        <td th:text="${#temporals.format(police.lastEduWrtDt, 'yyyy-MM-dd')}"></td>
                       </tr>
                       </tbody>
                     </table>