경력현황 직책 추가.

교육현황 직책 추가.
교육현황 최종수정일 수정.

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;

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,7 +133,8 @@
            b.crc004Sum,
            b.crc005Sum,
            b.crc006Sum,
-           b.lastWrtDt
+           b.lastCareerWrtDt,
+           c.lastEduWrtDt
 	from user_info a
     left outer join (
       select user_seq,
@@ -142,10 +144,16 @@
              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
+             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"'>

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>

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="${police.rownum}"></td>
-                        <td th:text="${list.organNm}"></td>
+                        <td th:text="${police.organNm}"></td>
-                        <td th:text="${list.ofcCd}"></td>
+                        <td th:text="${police.ofcCd}"></td>
-                        <td></td>
+                        <td>
-                        <td th:text="${list.titleCd}"></td>
+                          <th:block th:each="code:${session.commonCode.get('DT')}">
-                        <td th:text="${list.userNm}"></td>
+                            <th:block th:if="${code.itemCd eq police.dutyCd}" th:text="${code.itemValue}"></th:block>
-                        <td th:text="${list.birthDate}"></td>
+                          </th:block>
-                        <td th:text="${list.sex}"></td>
+                        </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>