개인실적통계 양식 수정.

src/main/java/com/dbnt/faisp/main/fpiMgt/statistics/model/PersonalAffairStatistics.java

@@ -3,8 +3,11 @@ package com.dbnt.faisp.main.fpiMgt.statistics.model;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.persistence.Column;
 import javax.persistence.Transient;
+import java.time.LocalDate;
 
 
 @Getter
@@ -27,6 +30,8 @@ public class PersonalAffairStatistics extends TypeStatistics {
   private String affairType4;
   @Transient
   private String docNo;
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate reportDt;
   @Transient
   private String affairRate;
 

src/main/resources/mybatisMapper/AffairStatisticsMapper.xml

@@ -597,6 +597,7 @@
            b.title,
            b.affair_type4,
            b.doc_no,
+				   b.report_dt,
            b.affair_rate
     from user_info a
            inner join
@@ -605,6 +606,7 @@
                   aa.title,
                   aa.affair_type4,
                   aa.doc_no,
+									aa.report_dt,
                   ab.affair_rate
             from affair_board aa
                   inner join affair_rating ab

src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html

@@ -35,6 +35,7 @@
           </th:block>
           <col style="width: 7%">
           <col style="width: 7%">
+          <col style="width: 7%">
           <col style="width: 5%">
         </colgroup>
         <thead>
@@ -53,6 +54,7 @@
           </th:block>
           <th>분야</th>
           <th>관련근거</th>
+          <th>보고일자</th>
           <th>기본제출건수</th>
         </tr>
         </thead>
@@ -70,7 +72,7 @@
             </th:block>
           </td>
           <td>
-            <th:block th:each="code:${session.commonCode.get('OFC')}">
+            <th:block th:each="code:${session.commonCode.get(statistics.ogCd)}">
               <th:block th:if="${code.itemCd eq statistics.ofcCd}" th:text="${code.itemValue}"></th:block>
             </th:block>
           </td>
@@ -93,6 +95,7 @@
             </th:block>
           </td>
           <td th:text="${statistics.docNo}"></td>
+          <td th:text="${#temporals.format(statistics.reportDt, 'yyyy-MM-dd')}"></td>
           <td th:text="${statistics.userStatus eq 'USC003'?2:1}"></td>
         </tr>
         </tbody>