From 4ad4b51a4fb177eafee8a3a355496e7b6c1be662 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 11 七月 2024 16:24:46 +0800
Subject: [PATCH] 花城 小程序签退打卡获取积分详情报错2
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 acc5006..e7640ad 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,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;
@@ -13,9 +15,30 @@
@ApiModelProperty("党员总数")
private Integer partyMemberCount;
- @ApiModelProperty("单位统计数据列表")
- private List<UnitActivityAnalysisVO> unitList;
+ @ApiModelProperty("单位统计数据列表（时长倒序）")
+ private PageVO<List<UnitActivityAnalysisVO>> unitList;
- @ApiModelProperty("党员统计数据列表")
- private List<PartyMemberAnalysisVO> partyMemberList;
+ @ApiModelProperty("党员统计数据列表（时长倒序）")
+ private PageVO<List<PartyMemberAnalysisVO>> partyMemberList;
+
+ @ApiModelProperty("机关单位服务总次数")
+ private Integer unitServiceTotalCount;
+
+ @ApiModelProperty("机关单位服务总时长")
+ private Integer unitServiceTotalTime;
+
+ @ApiModelProperty("党员服务总次数")
+ private Integer partyMemberServiceTotalCount;
+
+ @ApiModelProperty("党员服务总时长")
+ private Integer partyMemberServiceTotalTime;
+
+ @ApiModelProperty("报道单位累计总积分")
+ private Long awardSumCount;
+
+ @ApiModelProperty("报道党员累计总积分")
+ private Long partySumCount;
+
+ @ApiModelProperty("党员数据--聚合")
+ private List<PbCheckUnitStatisticsVo> groupPartyCount;
}
--
Gitblit v1.7.1