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 @@ + @@ -53,6 +54,7 @@ 분야 관련근거 + 보고일자 기본제출건수 @@ -70,7 +72,7 @@ - + @@ -93,6 +95,7 @@ +