From 7029f44d9480478ffe314ff3b9a7635aff31d4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= <cks0504_p@daum.net>
Date: Tue, 19 Sep 2023 14:52:15 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=8B=A4=EC=A0=81=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=EC=96=91=EC=8B=9D=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fpiMgt/statistics/model/PersonalAffairStatistics.java    | 5 +++++
 src/main/resources/mybatisMapper/AffairStatisticsMapper.xml  | 2 ++
 .../igActivities/fpiMgt/statistics/personalStatistics.html   | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/statistics/model/PersonalAffairStatistics.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/statistics/model/PersonalAffairStatistics.java
index 3ba8598e..cb4a82e1 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/statistics/model/PersonalAffairStatistics.java
+++ b/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;
 
diff --git a/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml b/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml
index d08f426b..23d31e06 100644
--- a/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml
+++ b/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
diff --git a/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html
index 4bd23521..281577de 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html
+++ b/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>