From 2c0bfbf2b677aad7a25a834f4832aaee87ae1dd2 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 28 Oct 2020 16:32:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E8=A6=81=E7=94=B3=E8=AF=B7=20bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AppVolunteerRankServiceImpl.java | 4 ++++ .../esua/epdc/activity/ActApplyInfoDTO.java | 20 ++++++++++++++++++ .../activity/form/ActApplyInfoFormDTO.java | 21 ++++++++++++++++++- .../activity/entity/ActApplyInfoEntity.java | 19 +++++++++++++++++ .../service/impl/ActApplyInfoServiceImpl.java | 8 +++++++ .../mapper/activity/ActApplyInfoDao.xml | 4 ++++ 6 files changed, 75 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java index 0ea50ec1..8e953749 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java @@ -58,6 +58,10 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService { // 网格 dto.setGrid(deptDTO.getGrid()); dto.setGridId(deptDTO.getGridId()); + dto.setMobile(userDetail.getMobile()); + dto.setFaceImg(userDetail.getFaceImg()); + dto.setRealName(userDetail.getRealName()); + dto.setNickname(userDetail.getNickname()); dto.setApplyUserId(userDetail.getUserId()); return appVolunteerRankFeignClient.addApply(dto); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActApplyInfoDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActApplyInfoDTO.java index be3d83aa..5d5c1fb3 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActApplyInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActApplyInfoDTO.java @@ -44,6 +44,26 @@ public class ActApplyInfoDTO implements Serializable { */ private String applyUserId; + /** + * 申请人昵称 + */ + private String nickname; + /** + * 申请人头像 + */ + private String faceImg; + + /** + * 申请人手机号 + */ + private String mobile; + + /** + * 申请人真实姓名 + */ + private String realName; + + /** * 志愿服务标题 */ diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActApplyInfoFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActApplyInfoFormDTO.java index 4f77d60f..0d75f246 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActApplyInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActApplyInfoFormDTO.java @@ -41,6 +41,25 @@ public class ActApplyInfoFormDTO implements Serializable { * 申请人ID */ private String applyUserId; + /** + * 申请人昵称 + */ + private String nickname; + /** + * 申请人头像 + */ + private String faceImg; + + /** + * 申请人手机号 + */ + private String mobile; + + /** + * 申请人真实姓名 + */ + private String realName; + /** * 志愿服务标题 @@ -53,7 +72,7 @@ public class ActApplyInfoFormDTO implements Serializable { * 志愿服务内容 */ @NotBlank(message = "志愿服务内容不能为空") - @Size(min = 0,max = 40,message = "志愿服务内容在500字以内") + @Size(min = 0,max = 500,message = "志愿服务内容在500字以内") private String actContent; /** diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActApplyInfoEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActApplyInfoEntity.java index 2b48c106..e10f04d6 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActApplyInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActApplyInfoEntity.java @@ -43,6 +43,25 @@ public class ActApplyInfoEntity extends BaseEpdcEntity { */ private String applyUserId; + /** + * 申请人昵称 + */ + private String nickname; + /** + * 申请人头像 + */ + private String faceImg; + + /** + * 申请人手机号 + */ + private String mobile; + + /** + * 申请人真实姓名 + */ + private String realName; + /** * 志愿服务标题 */ diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java index 90a3f3e7..388b1e2f 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java @@ -39,6 +39,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -118,9 +119,16 @@ public class ActApplyInfoServiceImpl extends BaseServiceImpl + + + +