From 47031815cc1b10b32676ce426b72da230164e849 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 9 Jul 2021 14:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8Eservice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ScreenPublicDataServiceImpl.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java
index 23840c1e..0d0682a6 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java
@@ -232,7 +232,20 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl<ScreenPublicDat
     public Result getUserjoin(String yearMonth) {
         // 如果统计月份为空，则统计上个月的数据
         yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth2(DateUtils.addDateMonths(new Date(),-1)) : yearMonth;
+        //获取人均议题 ，总的参与次数，
         List<UserjoinResultDTO> list = baseDao.getUserjoin(yearMonth);
+        //获取平均参与度
+        List<UserjoinResultDTO> joinList = baseDao.getUserJoinList(yearMonth);
+        for (UserjoinResultDTO userjoinResultDTO : joinList) {
+            for (UserjoinResultDTO resultDTO : list) {
+                if(resultDTO.getOrgId().equals(userjoinResultDTO.getOrgId())){
+                    resultDTO.setAvgJoin(userjoinResultDTO.getAvgJoin());
+                    resultDTO.setAvgJoinFz(userjoinResultDTO.getAvgJoinFz());
+                    resultDTO.setAvgJoinFm(userjoinResultDTO.getAvgJoinFm());
+                }
+            }
+        }
+
         // 将list转换为json格式
         if(list != null && list.size()>0) {
             UserjoinDTO result = new UserjoinDTO();