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 | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 116 insertions(+), 3 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 b67cd4b..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
@@ -3,7 +3,12 @@
import java.io.Serializable;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,7 +27,7 @@
/**
* 自增id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -61,7 +66,7 @@
private Date publishAt;
/**
- * 互动结束时间
+ * 活动结束时间
*/
private Date endAt;
@@ -94,6 +99,7 @@
/**
* 志愿者人数上限
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer volunteerMax;
/**
@@ -104,6 +110,7 @@
/**
* 参与者人数上限
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer participantMax;
/**
@@ -170,4 +177,110 @@
* 活动是否已默认好评
*/
private Integer isDefaultPraise;
+ /**
+ * 签到范围，默认0无限制
+ */
+ @TableField("`range`")
+ private Integer range;
+ /**
+ * 是否有积分奖励（1.是 2.否）
+ */
+ private Integer haveIntegralReward;
+ /**
+ * 居民积分奖励方式（1.按次奖励 2.记时奖励）
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer participantRewardWay;
+
+ /**
+ * 居民参与签到/打卡奖励积分
+ */
+ 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;
+
+ /**
+ * 参与次数上限
+ */
+ @TableField("`limit`")
+ private Integer limit;
+ /**
+ * 是否允许取消（1.允许 2.不允许）
+ */
+ private Integer canCancel;
+ /**
+ * 取消扣除积分
+ */
+ private Integer cancelDeduct;
+ /**
+ * 活动类型
+ */
+ 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