From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 19 八月 2021 17:53:40 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java | 88 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 4 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 db3abbf..c6ad7fc 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
@@ -6,6 +6,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
/**
* @Author: llming
@@ -26,7 +27,7 @@
*/
private String queDescribe;
/**
- * 状态 0 调研中 1已停止
+ * 状态 1待发布 2调研中 3已结束
*/
private Integer state;
/**
@@ -41,19 +42,98 @@
/**
* 提供居民
*/
- private Boolean forMasses;
+ 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