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 d0e4230f..3ba8598e 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 @@ -22,23 +22,14 @@ public class PersonalAffairStatistics extends TypeStatistics { @Transient private String dicCode; @Transient - private Integer r1Cnt; + private String title; @Transient - private Integer r2Cnt; + private String affairType4; @Transient - private Integer r3Cnt; + private String docNo; @Transient - private Integer r4Cnt; - @Transient - private Integer r5Cnt; - @Transient - private Integer r6Cnt; - @Transient - private Integer r7Cnt; - @Transient - private Integer r8Cnt; - @Transient - private Integer totalCnt; + private String affairRate; + } diff --git a/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml b/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml index 4c861080..d08f426b 100644 --- a/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml +++ b/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml @@ -594,35 +594,24 @@ title_cd, dic_code, user_nm, - b.r1Cnt, - b.r2Cnt, - b.r3Cnt, - b.r4Cnt, - b.r5Cnt, - b.r6Cnt, - b.r7Cnt, - b.r8Cnt, - b.totalCnt + b.title, + b.affair_type4, + b.doc_no, + b.affair_rate from user_info a inner join ( - select aa.wrt_user_seq , - sum(case when ab.affair_rate = 'AAR001' then 1 else 0 end) as r1Cnt, - sum(case when ab.affair_rate = 'AAR002' then 1 else 0 end) as r2Cnt, - sum(case when ab.affair_rate = 'AAR003' then 1 else 0 end) as r3Cnt, - sum(case when ab.affair_rate = 'AAR004' then 1 else 0 end) as r4Cnt, - sum(case when ab.affair_rate = 'AAR005' then 1 else 0 end) as r5Cnt, - sum(case when ab.affair_rate = 'AAR006' then 1 else 0 end) as r6Cnt, - sum(case when ab.affair_rate = 'AAR007' then 1 else 0 end) as r7Cnt, - sum(case when ab.affair_rate = 'AAR008' then 1 else 0 end) as r8Cnt, - count(*) as totalCnt - from affair_board aa + select aa.wrt_user_seq , + aa.title, + aa.affair_type4, + aa.doc_no, + ab.affair_rate + from affair_board aa inner join affair_rating ab on aa.affair_key = ab.affair_key and ab.affair_rate is not null and ab.organ_up = 'F' - - group by aa.wrt_user_seq + ) b on a.user_seq = b.wrt_user_seq - order by og_cd, ofc_cd, title_cd + order by og_cd, ofc_cd, title_cd, user_nm \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html index ad0ebe46..4bd23521 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html @@ -21,18 +21,20 @@
- + - - + + - + + + @@ -49,7 +51,9 @@ - + + + @@ -79,33 +83,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + - + + +
합계분야관련근거기본제출건수
O + + + +