From 6c06a8edade8c1882f2dc52298f68ab2bc63fdd3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-QGC5RJO\\DBNT" <yrseo@dbnt.co.kr>
Date: Fri, 27 Jan 2023 17:45:31 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=BD=EB=A0=A5=ED=98=84=ED=99=A9,=20?=
 =?UTF-8?q?=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=ED=91=9C=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dbnt/faisp/main/userInfo/model/UserEdu.java    | 4 ++++
 .../java/com/dbnt/faisp/main/userInfo/model/UserInfo.java   | 3 +++
 src/main/resources/mybatisMapper/UserInfoMapper.xml         | 6 ++++--
 src/main/resources/templates/police/career/careerMgt.html   | 2 ++
 .../resources/templates/police/education/educationMgt.html  | 2 ++
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserEdu.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserEdu.java
index 1c7c5da6..bb3242c2 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserEdu.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserEdu.java
@@ -58,6 +58,10 @@ public class UserEdu extends BaseModel{
   @Column(name = "wrt_dt")
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private LocalDateTime wrtDt;
+
+  @Transient
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime lastWrtDt;
   
   
   
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 5ef7ef1e..0ccbdcc4 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
@@ -126,6 +126,9 @@ public class UserInfo extends BaseModel implements UserDetails{
   private Integer crc005Sum;
   @Transient
   private Integer crc006Sum;
+  @Transient
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime lastWrtDt;
 
   @Transient
   private List<AccessConfig> accessConfigList;
diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index e7a0c9f2..3e5d55c9 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -133,7 +133,8 @@
            b.crc003Sum,
            b.crc004Sum,
            b.crc005Sum,
-           b.crc006Sum
+           b.crc006Sum,
+           b.lastWrtDt
 	from user_info a
     left outer join (
       select user_seq,
@@ -142,7 +143,8 @@
         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
+        sum(case when career_cd = 'CRC006' then work_month else 0 end) as crc006Sum,
+             max(wrt_dt) as lastWrtDt
       from user_career
       group by user_seq
     ) b on a.user_seq = b.user_seq
diff --git a/src/main/resources/templates/police/career/careerMgt.html b/src/main/resources/templates/police/career/careerMgt.html
index 56ec6a8a..39489c99 100644
--- a/src/main/resources/templates/police/career/careerMgt.html
+++ b/src/main/resources/templates/police/career/careerMgt.html
@@ -91,6 +91,7 @@
                         <th>정보경력</th>
                         <th>보안경력</th>
                         <th>국제경력</th>
+                        <th>최종수정일</th>
                       </tr>
                       </thead>
                       <tbody class="table-group-divider">
@@ -153,6 +154,7 @@
                             </th:block>
                           </th:block>
                         </td>
+                        <td th:text="${#temporals.format(police.lastWrtDt, '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 734f1500..2d98fca3 100644
--- a/src/main/resources/templates/police/education/educationMgt.html
+++ b/src/main/resources/templates/police/education/educationMgt.html
@@ -93,6 +93,7 @@
                         <th>석사</th>
                         <th>박사</th>
                         <th>전공</th>
+                        <th>최종수정일</th>
                       </tr>
                       </thead>
                       <tbody class="table-group-divider">
@@ -113,6 +114,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td th:text="${#temporals.format(list.lastWrtDt, 'yyyy-MM-dd')}"></td>
                       </tr>
                       </tbody>
                     </table>