Merge remote-tracking branch 'origin/master'

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/FeedbackInfoDTO.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 我提出的建议
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-14
+ */
+@Data
+public class FeedbackInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 建议，反馈内容
+     */
+    private String feedbackContent;
+
+    /**
+     * 反馈部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 反馈部门名称
+     */
+    private String deptName;
+}

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/TypeNode.java

@@ -0,0 +1,58 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 建议类别表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-14
+ */
+@Data
+public class TypeNode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String value;
+
+    /**
+     * 名称
+     */
+	private String label;
+
+    /**
+     * 上级ID
+     */
+	private String pid;
+
+    /**
+     * 子级集合
+     */
+    private List<TypeNode> children = new ArrayList<>();
+
+}

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/form/SuggestionMakeFormDTO.java

@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.suggestion.form;
+
+import com.elink.esua.epdc.dto.FeedbackInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 我提出的建议
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-14
+ */
+@Data
+public class SuggestionMakeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 建议表主键
+     */
+	private String id;
+
+    /**
+     * 建议类别 关联：epdc_suggestion_type
+     */
+	private String[] suggestionTypeIds;
+
+    /**
+     * 建议标题
+     */
+	private String suggestionTitle;
+
+    /**
+     * 建议内容
+     */
+	private String suggestionContent;
+
+    /**
+     * 建议图片 关联：epdc_custom_img 表；最多三张，逗号分隔
+     */
+	private String[] suggestionPics;
+
+    /**
+     * 用户昵称
+     */
+	private String nickname;
+
+    /**
+     * 用户头像
+     */
+	private String faceImg;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 是否是党员(0-否，1-是)
+     */
+	private String partyFlag;
+
+    /**
+     * 是否反馈 0-否，1-是
+     */
+	private String isFeedback;
+
+    /**
+     * 反馈信息集合
+     */
+    private List<FeedbackInfoDTO> feedbackList;
+}

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/result/MySuggestionResultDTO.java

@@ -0,0 +1,121 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.suggestion.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 我有建议要提  新增/修改 入参
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-14
+ */
+@Data
+public class MySuggestionResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 建议类别 关联：epdc_suggestion_type
+     */
+	private String[] suggestionTypeIds;
+
+    /**
+     * 建议标题
+     */
+	private String suggestionTitle;
+
+    /**
+     * 建议内容
+     */
+	private String suggestionContent;
+
+    /**
+     * 建议图片 关联：epdc_custom_img 表；最多三张，逗号分隔
+     */
+	private String[] suggestionPics;
+
+    /**
+     * 提意见的用户ID
+     */
+	private String userId;
+
+    /**
+     * 用户昵称
+     */
+	private String nickname;
+
+    /**
+     * 用户头像
+     */
+	private String faceImg;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 是否是党员(0-否，1-是)
+     */
+	private String partyFlag;
+
+    /**
+     * 居住网格id
+     */
+	private Long deptId;
+
+    /**
+     * 居住网格名称
+     */
+	private String deptName;
+
+    /**
+     * 父所有部门id
+     */
+	private String parentDeptIds;
+
+    /**
+     * 父所有部门名称
+     */
+	private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+	private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+	private String allDeptNames;
+
+    /**
+     * 是否反馈 0-否，1-是
+     */
+	private String isFeedback;
+
+}