Merge branch 'master' of http://121.42.41.42:7070/r/epdc-cloud-client-yushan

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppGridManFormDTO.java

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * create by: zhangfenghe
+ * description: 网格员列表请求接口对象
+ * create time: 2021/8/28$ 18:11$
+ */
+@Data
+public class EpdcAppGridManFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 682964925596811152L;
+
+    /**
+     *页码
+     */
+    private int pageIndex;
+
+    /**
+     *页容量
+     */
+    private int pageSize;
+
+    /**
+     *所属网格id
+     */
+    private Long deptId;
+
+}

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppGridManListResultDTO.java

@@ -0,0 +1,36 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * create by: zhangfenghe
+ * description: 网格员列表返回对象
+ * create time: 2021/8/28$ $
+ */
+@Data
+public class EpdcAppGridManListResultDTO implements Serializable {
+    private static final long serialVersionUID = -2712265120736911585L;
+
+
+    /**
+     *姓名
+     */
+    private String realName;
+
+    /**
+     *头像
+     */
+    private String headHrl;
+
+    /**
+     *箴言
+     */
+    private String proverbs;
+
+    /**
+     *电话
+     */
+    private String mobile;
+}

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java

@@ -0,0 +1,91 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: epdc-cloud-api-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-30 10:43
+ **/
+@Data
+public class AppVolunteerApplyDTO implements Serializable {
+
+    /**
+     *id
+     */
+    private String id;
+
+    /**
+     *身份证
+     */
+    private String idCard;
+
+    /**
+     *手机
+     */
+    private String mobile;
+
+    /**
+     *织织id
+     */
+    private List<Long> volunteerOrgIds;
+
+    /**
+     *自我介绍
+     */
+    private String introduceInfo;
+
+    /**
+     *姓名
+     */
+    private String realName;
+
+
+    /**
+     * 网格
+     */
+    private String deptName;
+    /**
+     * 网格ID
+     */
+    private String deptId;
+
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户头像
+     */
+    private String faceImg;
+
+    /**
+     * 党员标识
+     */
+    private String partyFlag;
+
+
+
+}

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java

@@ -0,0 +1,68 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: epdc-cloud-heart-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-29 09:49
+ **/
+@Data
+public class AppVolunteerDetailDTO implements Serializable {
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 自我介绍
+     */
+    private String introduceInfo;
+
+    /**
+     * 认证状态：0审核中 1审核通过 2审核驳回
+     */
+    private String state;
+
+    /**
+     * 状态名称
+     */
+    private String stateName;
+
+    /**
+     * 审核理由
+     */
+    private String reason;
+
+    /**
+     * 组织id
+     */
+    private List<Long> volunteerOrgIds;
+
+    /**
+     * 认组织
+     */
+    private String volunteerOrgNames;
+
+
+}

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerDTO.java

@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.volunteer;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -41,12 +42,12 @@ public class VolunteerDTO implements Serializable {
     /**
      * 姓名
      */
-	private String name;
+    private String realName;
 
     /**
      * 身份证
      */
-	private String idcard;
+    private String idCard;
 
     /**
      * 电话

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerOrgDTO.java

@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.volunteer;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -36,7 +37,7 @@ public class VolunteerOrgDTO implements Serializable {
     /**
      * 主键
      */
-	private String id;
+    private Long id;
 
     /**
      * 组织名称
@@ -74,33 +75,33 @@ public class VolunteerOrgDTO implements Serializable {
     private String address;
 
     /**
-     * 删除标识 0-否，1-是
+     * 备注
      */
-	private String delFlag;
+    private String note;
 
     /**
-     * 乐观锁
+     * 删除标识  0：未删除    1：删除
      */
-	private Integer revision;
+    private Integer delFlag;
 
     /**
-     * 创建人
+     * 创建者
      */
-	private String createdBy;
+    private Long creator;
 
     /**
      * 创建时间
      */
-	private Date createdTime;
+    private Date createDate;
 
     /**
-     * 更新人
+     * 更新者
      */
-	private String updatedBy;
+    private Long updater;
 
     /**
      * 更新时间
      */
-	private Date updatedTime;
+    private Date updateDate;
 
 }

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerPageDTO.java

@@ -0,0 +1,62 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-heart-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-29 09:49
+ **/
+@Data
+public class VolunteerPageDTO implements Serializable {
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 自我介绍
+     */
+    private String introduceInfo;
+
+    /**
+     * 认证状态：0审核中 1审核通过 2审核驳回
+     */
+    private String state;
+
+    /**
+     * 状态名称
+     */
+    private String stateName;
+
+    /**
+     * 审核理由
+     */
+    private String reason;
+
+    /**
+     * 认组织
+     */
+    private String volunteerOrgNames;
+
+
+}

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java

@@ -162,4 +162,9 @@ public class NoticeDTO implements Serializable {
 
     private String typeName;
 
+    /**
+     * 索引图
+     */
+    private String imgUrl;
+
 }

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcContentListFormDTO.java

@@ -0,0 +1,37 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/8/28 20:58
+ */
+@Data
+public class EpdcContentListFormDTO implements Serializable {
+    private static final long serialVersionUID = 6154511594701893385L;
+
+    /**
+     * 页码  -必传项
+     */
+    @NotNull(message = "页码 不能为空")
+    private Integer pageIndex;
+
+    /**
+     * 页容量  -必传项
+     */
+    @NotNull(message = "页容量 不能为空")
+    private Integer pageSize;
+
+    /**
+     * 内容类别ID，为空时即最新资讯列表
+     */
+    private String typeId;
+
+    /**
+     * 部分ID
+     */
+    private Long deptId;
+}

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java

@@ -0,0 +1,49 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/8/28 21:10
+ */
+@Data
+public class EpdcContentDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = 1039239618034666529L;
+
+    /**
+     * 内容ID
+     */
+    private String id;
+
+    /**
+     * 资讯标题
+     */
+    private String noticeTitle;
+
+    /**
+     * 资讯发布时间
+     */
+    private String releaseTime;
+
+    /**
+     * 发布部门
+     */
+    private String deptName;
+
+    /**
+     * 索引图
+     */
+    private String imgUrl;
+
+    /**
+     * 浏览数
+     */
+    private String readingAmount;
+
+    /**
+     * 内容
+     */
+    private String noticeContent;
+}

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentListResultDTO.java

@@ -0,0 +1,45 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/8/28 21:08
+ */
+@Data
+public class EpdcContentListResultDTO implements Serializable {
+    private static final long serialVersionUID = -6715636720585034110L;
+
+    /**
+     * 内容ID
+     */
+    private String id;
+
+    /**
+     * 资讯标题
+     */
+    private String noticeTitle;
+
+    /**
+     * 资讯发布时间
+     */
+    private String releaseTime;
+
+    /**
+     * 发布部门
+     */
+    private String deptName;
+
+    /**
+     * 索引图
+     */
+    private String imgUrl;
+
+    /**
+     * 浏览数
+     */
+    private String readingAmount;
+
+}

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeModuleListResultDTO.java

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/8/28 20:56
+ */
+@Data
+public class EpdcNoticeModuleListResultDTO implements Serializable {
+    private static final long serialVersionUID = -7828175497993532480L;
+
+    /**
+     * 栏目ID
+     */
+    private String id;
+
+    /**
+     * 栏目名称
+     */
+    private String typeName;
+}

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java

@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * create by: zhangfenghe
+ * description: 党员亮身份信息入库请求参数
+ * create time: 2021/8/28$ 19:10$
+ */
+@Data
+public class EpdcAppShowIdentityFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -5593165602745999938L;
+
+    /**
+     *用户ID
+     */
+    private String userId;
+
+    /**
+     *头像地址
+     */
+    private String headUrl;
+
+    /**
+     *格言
+     */
+    private String motto;
+
+    /**
+     *承诺
+     */
+    private String promise;
+
+    /**
+     *服务范围
+     */
+    private String serviceArea;
+}

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIdentityDetailResultDTO.java

@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * create by: zhangfenghe
+ * description: 党员亮身份信息详情返回对象
+ * create time: 2021/8/28$ 19:52$
+ */
+@Data
+public class EpdcAppIdentityDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = 3740385980880312741L;
+
+    /**
+     *格言
+     */
+    private String motto;
+
+    /**
+     *承诺
+     */
+    private String promise;
+
+    /**
+     *服务范围
+     */
+    private String serviceArea;
+
+    /**
+     *头像
+     */
+    private String headUrl;
+}

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java

@@ -31,4 +31,9 @@ public class EpdcUserInfoResultDTO implements Serializable {
      */
     private Integer grade;
 
+    /**
+     * 亮身份标识：0-否，1-是
+     */
+    private String showIdentityFlag;
+
 }