From 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 17:30:57 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java | 96 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 89 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
index 3e8d9d7..ae0cc9c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
@@ -1,11 +1,13 @@
package com.panzhihua.service_community.model.dos;
+import java.io.Serializable;
+import java.util.Date;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import java.io.Serializable;
+import lombok.Data;
/**
* @Author: llming
@@ -15,7 +17,7 @@
@TableName(value = "com_act_questnaire")
public class ComActQuestnaireDO extends BaseDO implements Serializable {
private static final long serialVersionUID = 4525826123672211880L;
- @TableId(type= IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 标题
@@ -26,7 +28,7 @@
*/
private String queDescribe;
/**
- * 状态 0 调研中 1已停止
+ * 状态 1待发布 2调研中 3已结束
*/
private Integer state;
/**
@@ -41,19 +43,99 @@
/**
* 提供居民
*/
- private Boolean forMesses;
+ private Integer forMasses;
/**
* 提供党员
*/
- private Boolean forParty;
+ private Integer forParty;
/**
* 提供志愿者
*/
- private Boolean forVolunteer;
+ private Integer forVolunteer;
/**
* 是否隐藏显示 0 显示 1 隐藏
*/
private Integer isHide;
+ /**
+ * 调研开始时间
+ */
+ private Date startTime;
+
+ /**
+ * 调研结束时间
+ */
+ private Date endTime;
+
+ /**
+ * 问卷调查备注(应用名称)
+ */
+ private String remark;
+
+ /**
+ * 是否是封面（1.是 2.否）
+ */
+ private Integer isCover;
+
+ /**
+ * 是否强制调研（1.是 2.否）
+ */
+ private Integer isForce;
+
+ /**
+ * 广告弹窗（1.是 2.否 ）
+ */
+ private Integer adverPositionPopup;
+
+ /**
+ * 广告顶部（1.是 2.否）
+ */
+ private Integer adverPositionTop;
+
+ /**
+ * 广告应用（1.是 2.否）
+ */
+ private Integer adverPositionApplication;
+
+ /**
+ * 组件唯一key
+ */
+ private String projectKey;
+
+ /**
+ * 填报项数量
+ */
+ private Integer count;
+
+ /**
+ * 浏览量
+ */
+ private Long viewNum;
+ /**
+ * 发布时间
+ */
+ private Date publishTime;
+ /**
+ * 组件json数据
+ */
+ private String jsonObject;
+
+ /**
+ * 默认是否枚举
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 2;
+ }
+
+ /**
+ * 状态 1待发布 2调研中 3已结束
+ */
+ public interface state {
+ int dfb = 1;
+ int dyz = 2;
+ int yjs = 3;
+ }
+
}
--
Gitblit v1.7.1