From 40bfb646d1b962d33841c1ebbceb0dd7cb668bfb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 29 四月 2025 14:54:04 +0800
Subject: [PATCH] 后台日志管理

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 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 6946e0c..4cd15e0 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,6 +1,7 @@
 package com.panzhihua.common.model.vos.neighbor;
 
 import com.panzhihua.common.model.vos.PageVO;
+import com.panzhihua.common.model.vos.common.PbCheckUnitStatisticsVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -15,26 +16,29 @@
     private Integer partyMemberCount;
 
     @ApiModelProperty("单位统计数据列表(时长倒序)")
-    private PageVO<List<UnitActivityAnalysisVO>> unitListByTime;
+    private PageVO<List<UnitActivityAnalysisVO>> unitList;
 
     @ApiModelProperty("党员统计数据列表(时长倒序)")
-    private PageVO<List<PartyMemberAnalysisVO>> partyMemberListByTime;
-
-    @ApiModelProperty("单位统计数据列表(次数倒序)")
-    private PageVO<List<UnitActivityAnalysisVO>> unitListByTimes;
-
-    @ApiModelProperty("党员统计数据列表(次数倒序)")
-    private PageVO<List<PartyMemberAnalysisVO>> partyMemberByTimes;
+    private PageVO<List<PartyMemberAnalysisVO>> partyMemberList;
 
     @ApiModelProperty("机关单位服务总次数")
     private Integer unitServiceTotalCount;
 
     @ApiModelProperty("机关单位服务总时长")
-    private Integer unitServiceTotalTime;
+    private Double unitServiceTotalTime;
 
     @ApiModelProperty("党员服务总次数")
     private Integer partyMemberServiceTotalCount;
 
     @ApiModelProperty("党员服务总时长")
-    private Integer partyMemberServiceTotalTime;
+    private Double partyMemberServiceTotalTime;
+
+    @ApiModelProperty("报道单位累计总积分")
+    private Long awardSumCount;
+
+    @ApiModelProperty("报道党员累计总积分")
+    private Long partySumCount;
+
+    @ApiModelProperty("党员数据--聚合")
+    private List<PbCheckUnitStatisticsVo> groupPartyCount;
 }

--
Gitblit v1.7.1