From a611bfdeb9036d32c3877d43a0dca75bac93ebe4 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 14:08:57 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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
index 9a6d2f3..a7288a4 100644
--- 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
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -20,26 +21,50 @@
@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 BigDecimal tyNumPercent = new BigDecimal(0);
+
@ApiModelProperty(value = "美术类党员人数")
private Integer msNum;
+
+ @ApiModelProperty(value = "美术类党员人数百分比")
+ private BigDecimal msNumPercent = new BigDecimal(0);
@ApiModelProperty(value = "音乐类党员人数")
private Integer yyNum;
+ @ApiModelProperty(value = "音乐类党员人数百分比")
+ private BigDecimal yyNumPercent = new BigDecimal(0);
+
@ApiModelProperty(value = "舞蹈类党员人数")
private Integer wdNum;
+
+ @ApiModelProperty(value = "舞蹈类党员人数百分比")
+ private BigDecimal wdNumPercent = new BigDecimal(0);
@ApiModelProperty(value = "其他类党员人数")
private Integer qtNum;
+ @ApiModelProperty(value = "其他类党员人数百分比")
+ private BigDecimal qtNumPercent = new BigDecimal(0);
+
@ApiModelProperty(value = "无类型党员人数")
private Integer wuNum;
+
+ @ApiModelProperty(value = "无类型党员人数百分比")
+ private BigDecimal wuNumPercent = new BigDecimal(0);
@ApiModelProperty(value = "党员列表")
private List<PartyBuildingMemberVO> partyMemberList;
@@ -53,14 +78,26 @@
@ApiModelProperty(value = "参与志愿者活动次数")
private Integer participateVolunteerActivityNum;
+ @ApiModelProperty(value = "参与志愿者活动次数百分比")
+ private BigDecimal participateVolunteerActivityNumPercent = new BigDecimal(0);
+
@ApiModelProperty(value = "参与志愿者活动时长")
private Integer participateVolunteerActivityDuration;
+
+ @ApiModelProperty(value = "参与志愿者活动时长百分比")
+ private BigDecimal participateVolunteerActivityDurationPercent = new BigDecimal(0);
@ApiModelProperty(value = "参与党员活动次数")
private Integer participatePartyActivityNum;
+ @ApiModelProperty(value = "参与党员活动次数百分比")
+ private BigDecimal participatePartyActivityNumPercent = new BigDecimal(0);
+
@ApiModelProperty(value = "参与党员活动时长")
private Integer participatePartyActivityDuration;
+
+ @ApiModelProperty(value = "参与党员活动时长百分比")
+ private BigDecimal participatePartyActivityDurationPercent = new BigDecimal(0);
@ApiModelProperty(value = "月份统计list")
private List<String> monthList;
@@ -78,8 +115,8 @@
private List<String> cumulativeEasyList;
@ApiModelProperty(value = "完成微心愿数量")
- private Integer wishNum;
+ private String wishNum = "0";
@ApiModelProperty(value = "完成随手拍数量")
- private Integer easyNum;
+ private String easyNum = "0";
}
--
Gitblit v1.7.1