From 85cf42314fc04a637f1a44e78c1e476a445bf0f3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 13:29:18 +0800
Subject: [PATCH] Merge branch 'dev'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java |   92 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 92 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java
new file mode 100644
index 0000000..b442cbe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java
@@ -0,0 +1,92 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author lyq
+ * 查询党建数据统计党组织返回参数
+ */
+@Data
+@ApiModel("查询党建数据统计党组织返回参数")
+public class ComDataStatisticsOrgVo {
+
+    @ApiModelProperty(value = "党员人数")
+    private Integer partyMemberNum;
+
+    @ApiModelProperty(value = "正式党员人数")
+    private Integer formalPartyMemberNum;
+
+    @ApiModelProperty(value = "正式党员人数百分比")
+    private BigDecimal formalPartyMemberNumPercent = new BigDecimal(0);
+
+    @ApiModelProperty(value = "预备党员人数")
+    private Integer preparePartyMemberNum;
+
+    @ApiModelProperty(value = "预备党员人数百分比")
+    private BigDecimal preparePartyMemberNumPercent = new BigDecimal(0);
+
+    @ApiModelProperty(value = "体育类党员人数")
+    private Integer tyNum;
+
+    @ApiModelProperty(value = "美术类党员人数")
+    private Integer msNum;
+
+    @ApiModelProperty(value = "音乐类党员人数")
+    private Integer yyNum;
+
+    @ApiModelProperty(value = "舞蹈类党员人数")
+    private Integer wdNum;
+
+    @ApiModelProperty(value = "其他类党员人数")
+    private Integer qtNum;
+
+    @ApiModelProperty(value = "无类型党员人数")
+    private Integer wuNum;
+
+    @ApiModelProperty(value = "党员列表")
+    private List<PartyBuildingMemberVO> partyMemberList;
+
+    @ApiModelProperty(value = "参与活动次数")
+    private Integer participateActivityNum;
+
+    @ApiModelProperty(value = "参与活动时长")
+    private Integer participateActivityDuration;
+
+    @ApiModelProperty(value = "参与志愿者活动次数")
+    private Integer participateVolunteerActivityNum;
+
+    @ApiModelProperty(value = "参与志愿者活动时长")
+    private Integer participateVolunteerActivityDuration;
+
+    @ApiModelProperty(value = "参与党员活动次数")
+    private Integer participatePartyActivityNum;
+
+    @ApiModelProperty(value = "参与党员活动时长")
+    private Integer participatePartyActivityDuration;
+
+    @ApiModelProperty(value = "月份统计list")
+    private List<String> monthList;
+
+    @ApiModelProperty(value = "完成微心愿折线统计数据")
+    private List<String> completeWishList;
+
+    @ApiModelProperty(value = "累计微心愿折线统计数据")
+    private List<String> cumulativeWishList;
+
+    @ApiModelProperty(value = "完成随手拍折线统计数据")
+    private List<String> completeEasyList;
+
+    @ApiModelProperty(value = "累计随手拍折线统计数据")
+    private List<String> cumulativeEasyList;
+
+    @ApiModelProperty(value = "完成微心愿数量")
+    private String wishNum = "0";
+
+    @ApiModelProperty(value = "完成随手拍数量")
+    private String easyNum = "0";
+}

--
Gitblit v1.7.1