From f3e7ecf643ec517ad93b80a50e63eaab90b6461b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 07 二月 2023 15:51:22 +0800
Subject: [PATCH] 三说会堂事件搜索修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
index 7a6d0cd..8ca1d83 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -26,7 +27,7 @@
/**
* 自增id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -98,6 +99,7 @@
/**
* 志愿者人数上限
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer volunteerMax;
/**
@@ -108,6 +110,7 @@
/**
* 参与者人数上限
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer participantMax;
/**
@@ -184,13 +187,38 @@
*/
private Integer haveIntegralReward;
/**
- * 积分奖励方式（1.按次奖励 2.记时奖励）
+ * 居民积分奖励方式（1.按次奖励 2.记时奖励）
*/
- private Integer rewardWay;
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer participantRewardWay;
+
/**
- * 奖励积分
+ * 居民参与签到/打卡奖励积分
*/
- private Integer rewardIntegral;
+ private Integer participantRewardIntegral;
+
+ /**
+ * 志愿者积分奖励方式（1.按次奖励 2.记时奖励）
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer volunteerRewardWay;
+
+ /**
+ * 志愿者参与签到/打卡奖励积分
+ */
+ private Integer volunteerRewardIntegral;
+
+ /**
+ * 党员积分奖励方式（1.按次奖励 2.记时奖励）
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer pbRewardWay;
+
+ /**
+ * 党员参与签到/打卡奖励积分
+ */
+ private Integer pbRewardIntegral;
+
/**
* 参与次数上限
*/
@@ -208,4 +236,51 @@
* 活动类型
*/
private String activityType;
+
+ /**
+ * 是否项目
+ */
+ private Integer isProject;
+
+ /**
+ * 项目id
+ */
+ private Long projectId;
+
+ /**
+ * 活动类型 1 社区活动 4项目活动 5服务活动
+ */
+ private Integer type;
+
+ /**
+ * 党员参与者人数下线
+ */
+ private Integer partyMemberMin;
+
+ /**
+ * 党员参与者人数上限
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer partyMemberMax;
+ /**
+ * 签退范围，默认0无限制
+ */
+ private Integer signOutRange;
+
+ /**
+ * 单次活动时长（小时）
+ */
+ private Integer duration;
+
+ private Integer isArticle;
+
+ private String jumpArticleUrl;
+
+ private Long relationId;
+
+ private String phone;
+
+ private Long checkUnitId;
+
+ private Long topicId;
}
--
Gitblit v1.7.1