From 0cbbecaafcfdb30d3e7370f85bbe3f3123499309 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 06 七月 2022 14:50:24 +0800
Subject: [PATCH] 双争后台统计

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java
index d3f6975..0ff8621 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java
@@ -1,5 +1,6 @@
 package com.panzhihua.common.model.vos.neighbor;
 
+import com.panzhihua.common.model.vos.PageVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,6 +11,25 @@
     @ApiModelProperty("机关单位总数")
     private Integer unitCount;
 
-    @ApiModelProperty("统计数据")
-    private List<ComActNeighborCircleAnalysisVO> dataList;
+    @ApiModelProperty("党员总数")
+    private Integer partyMemberCount;
+
+    @ApiModelProperty("单位统计数据列表")
+    private PageVO<List<UnitActivityAnalysisVO>> unitList;
+
+
+    @ApiModelProperty("党员统计数据列表")
+    private PageVO<List<PartyMemberAnalysisVO>> partyMemberList;
+
+    @ApiModelProperty("机关单位服务总次数")
+    private Integer unitServiceTotalCount;
+
+    @ApiModelProperty("机关单位服务总时长")
+    private Integer unitServiceTotalTime;
+
+    @ApiModelProperty("党员服务总次数")
+    private Integer partyMemberServiceTotalCount;
+
+    @ApiModelProperty("党员服务总时长")
+    private Integer partyMemberServiceTotalTime;
 }

--
Gitblit v1.7.1