公众参与service

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();