Merge remote-tracking branch 'origin/dev' into dev

101captain

2022-03-03 1ebbd7d5c83cc81e5cf94aa4d2a87a4ecd8a03c3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java

New file
@@ -0,0 +1,85 @@
package com.panzhihua.common.model.vos.partybuilding;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author lyq
 * 查询党建数据统计党组织返回参数
 */
@Data
@ApiModel("查询党建数据统计党组织返回参数")
public class ComDataStatisticsOrgVo {

    @ApiModelProperty(value = "党员人数")
    private Integer partyMemberNum;

    @ApiModelProperty(value = "正式党员人数")
    private Integer formalPartyMemberNum;

    @ApiModelProperty(value = "预备党员人数")
    private Integer preparePartyMemberNum;

    @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";
}