From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java | 21 +++++++++++++++++----
1 files changed, 17 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..973dce8 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;
@@ -13,9 +14,21 @@
@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;
}
--
Gitblit v1.7.1