diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppGridManFormDTO.java similarity index 91% rename from epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java rename to epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppGridManFormDTO.java index 68ad9d1..b4161b5 100644 --- a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java +++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppGridManFormDTO.java @@ -1,4 +1,4 @@ -package com.elink.esua.epdc.dto.form; +package com.elink.esua.epdc.dto.epdc.form; import lombok.Data; diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppGridManListResultDTO.java similarity index 92% rename from epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java rename to epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppGridManListResultDTO.java index 49aa91c..f44832d 100644 --- a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java +++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppGridManListResultDTO.java @@ -1,4 +1,4 @@ -package com.elink.esua.epdc.dto.result; +package com.elink.esua.epdc.dto.epdc.result; import lombok.Data; diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java new file mode 100644 index 0000000..02887c2 --- /dev/null +++ b/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 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; + + + +} \ No newline at end of file diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java new file mode 100644 index 0000000..07a0273 --- /dev/null +++ b/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 volunteerOrgIds; + + /** + * 认组织 + */ + private String volunteerOrgNames; + + +} \ No newline at end of file diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerPageDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerPageDTO.java new file mode 100644 index 0000000..349b932 --- /dev/null +++ b/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; + + +} \ No newline at end of file diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java similarity index 89% rename from epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java rename to epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java index 8f50838..ad58b6e 100644 --- a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java @@ -1,4 +1,4 @@ -package com.elink.esua.epdc.dto.form; +package com.elink.esua.epdc.dto.epdc.form; import lombok.Data; @@ -17,7 +17,7 @@ public class EpdcAppShowIdentityFormDTO implements Serializable { /** *用户ID */ - private Long userId; + private String userId; /** *头像地址 diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIdentityDetailResultDTO.java similarity index 92% rename from epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java rename to epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIdentityDetailResultDTO.java index 089936c..09510d5 100644 --- a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIdentityDetailResultDTO.java @@ -1,4 +1,4 @@ -package com.elink.esua.epdc.dto.result; +package com.elink.esua.epdc.dto.epdc.result; import lombok.Data; diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java index e36671a..932dd01 100644 --- a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java +++ b/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; + }