Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -161,9 +161,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
                 formDTO.getDataType(),
                 formDTO.getCustomerId(),
                 dateId);
-        if (CollectionUtils.isNotEmpty(currentAgency)) {
-            returnDto.getSubRankList().addAll(currentAgency);
-        }
+
         returnDto.getSubRankList().addAll(subAgencyRankList);
         returnDto.getSubRankList().addAll(subGridList);
         int participateUserTotal = 0;
@@ -172,6 +170,12 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
             participateUserTotal += subAgency.getParticipateUserTotal();
             participateTotal += subAgency.getParticipateTotal();
         }
+        if (CollectionUtils.isNotEmpty(currentAgency)) {
+            for (WorkRecordSubRank m : currentAgency) {
+                participateUserTotal += m.getParticipateUserTotal();
+                participateTotal += m.getParticipateTotal();
+            }
+        }
         returnDto.setParticipateTotal(participateTotal);
         returnDto.setParticipateUserTotal(participateUserTotal);
         returnDto.setSubRankList(CollectionUtils.isNotEmpty(returnDto.getSubRankList()) && returnDto.getSubRankList().size() >= formDTO.getTopRow() ?