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/ComDataStatisticsMemberVo.java |  108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 108 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java
new file mode 100644
index 0000000..958e7bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java
@@ -0,0 +1,108 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询党建数据统计返回参数
+ */
+@Data
+@ApiModel("分页查询党建数据统计返回参数")
+public class ComDataStatisticsMemberVo {
+
+    @ApiModelProperty(value = "党员id")
+    private Long id;
+
+    @ApiModelProperty(value = "党员姓名")
+    private String name;
+
+    @ApiModelProperty(value = "党员头像url")
+    private String photoPath;
+
+    @ApiModelProperty(value = "是否是党委(1.是 2.否)")
+    private Integer isRole;
+
+    @ApiModelProperty(value = "党员类型(1.预备党员 2.正式党员)")
+    private Integer type;
+
+    @ApiModelProperty(value = "性别(1.是 2.否)")
+    private Integer sex;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer age;
+
+    @ApiModelProperty(value = "党龄")
+    private Integer partyAge;
+
+    @ApiModelProperty(value = "职能")
+    private String function;
+
+    @ApiModelProperty(value = "特长类别(1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他)")
+    private Integer specialtyCategory;
+
+    @ApiModelProperty(value = "特长描述")
+    private String specialtyName;
+
+    @ApiModelProperty(value = "职位")
+    private String position;
+
+    @ApiModelProperty(value = "职位2")
+    private String positionTwo;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idCard;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "报道单位id")
+    private Long checkUnitId;
+
+    @ApiModelProperty(value = "报道单位名称")
+    private String checkUnitName;
+
+    @ApiModelProperty(value = "所属党组织id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "所属党组织名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "社区id")
+    private Long communityId;
+
+    @ApiModelProperty(value = "总活动次数")
+    private Integer activityCount;
+
+    @ApiModelProperty(value = "总活动时长(小时)")
+    private Integer activityDuration;
+
+    @ApiModelProperty(value = "党员活动次数")
+    private Integer partyActivityCount;
+
+    @ApiModelProperty(value = "党员活动时长(小时)")
+    private Integer partyActivityDuration = 0;
+
+    @ApiModelProperty(value = "党员活动积分数量")
+    private Integer partyActivityIntegral;
+
+    @ApiModelProperty(value = "志愿者活动次数")
+    private Integer volunteerActivityCount;
+
+    @ApiModelProperty(value = "志愿者活动时长(小时)")
+    private Integer volunteerActivityDuration;
+
+    @ApiModelProperty(value = "志愿者活动积分数量")
+    private Integer volunteerActivityIntegral;
+
+    @ApiModelProperty(value = "完成微心愿数量")
+    private Integer wishCount;
+
+    @ApiModelProperty(value = "完成随手拍数量")
+    private Integer easyCount;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+}

--
Gitblit v1.7.1