From 2b6a8a9d32113a489d23bfe00148eca596629aa2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 31 Jul 2020 14:02:16 +0800 Subject: [PATCH] =?UTF-8?q?userdeatil=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/AuditingUserDetailResultDTO.java | 17 +-------- .../work/UserHistoricalActResultDTO.java | 16 ++++++++- .../service/impl/WorkActUserServiceImpl.java | 36 ++++++++++++++----- 3 files changed, 43 insertions(+), 26 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingUserDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingUserDetailResultDTO.java index 764c81b2fe..f8f6832129 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingUserDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingUserDetailResultDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.result.work; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -65,22 +66,6 @@ public class AuditingUserDetailResultDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date signUpTime; - /** - * 返回文本：已拒绝5次 - */ - private String refusedCountDesc; - - /** - * 最近一次拒绝原因 - */ - private String latestRefusedReason; - - /** - * 最近一次拒绝的时间yyyy-MM-dd HH:mm:ss - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date latestAuditTime; - /** * 历史活动情况 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActResultDTO.java index a6046ffd63..aa983d38f6 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActResultDTO.java @@ -1,12 +1,15 @@ package com.epmet.dto.result.work; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** - * 描述一下 + * 报名审核-人员历史活动情况 返参DTO * * @author yinzuomei@elink-cn.com * @date 2020/7/23 16:15 @@ -51,4 +54,15 @@ public class UserHistoricalActResultDTO implements Serializable { *历史活动列表 */ private List actInfoList; + + public UserHistoricalActResultDTO() { + userId = StrConstant.EPMETY_STR; + headImgUrl = StrConstant.EPMETY_STR; + nickName = StrConstant.EPMETY_STR; + realName = StrConstant.EPMETY_STR; + signInActNum = NumConstant.ZERO; + signUpActNum = NumConstant.ZERO; + obtainPointsActNum = NumConstant.ZERO; + actInfoList = new ArrayList<>(); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index 61d4466c38..a0aa461f52 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -320,10 +320,24 @@ public class WorkActUserServiceImpl implements WorkActUserService { resultDTO.setActUserRelationId(actUserRelationDTO.getId()); resultDTO.setActId(actUserRelationDTO.getActId()); resultDTO.setUserId(actUserRelationDTO.getUserId()); - resultDTO.setRealName(userBaseInfo.getRealName()); - resultDTO.setGender(userBaseInfo.getGender()); - resultDTO.setMobile(userBaseInfo.getMobile()); - resultDTO.setIdNum(userBaseInfo.getIdNum()); + if (StringUtils.isNotBlank(userBaseInfo.getRealName())) { + resultDTO.setRealName(userBaseInfo.getRealName()); + } else { + resultDTO.setRealName(StrConstant.EPMETY_STR); + } + if (StringUtils.isNotBlank(userBaseInfo.getGender())) { + resultDTO.setGender(userBaseInfo.getGender()); + } else { + resultDTO.setGender(StrConstant.EPMETY_STR); + } + if (StringUtils.isNotBlank(userBaseInfo.getMobile())) { + resultDTO.setMobile(userBaseInfo.getMobile()); + } else { + resultDTO.setMobile(StrConstant.EPMETY_STR); + } + if (StringUtils.isNotBlank(userBaseInfo.getIdNum())) { + resultDTO.setIdNum(userBaseInfo.getIdNum()); + } resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress()); resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime()); /** @@ -345,8 +359,6 @@ public class WorkActUserServiceImpl implements WorkActUserService { historicalAuditResult.setLatestAuditTime(latestRefused.getCreatedTime()); historicalAuditResult.setLatestRefusedReason(latestRefused.getReason()); historicalAuditResult.setRefusedCountDesc(String.format("已拒绝%s次",refusedCount)); - resultDTO.setLatestAuditTime(latestRefused.getCreatedTime()); - resultDTO.setLatestRefusedReason(latestRefused.getReason()); resultDTO.setHistoricalAuditResult(historicalAuditResult); } }else if(ActConstant.ACT_USER_STATUS_PASSED.equals(resultDTO.getStatus())||ActConstant.ACT_USER_STATUS_REFUSED.equals(resultDTO.getStatus())){ @@ -377,9 +389,15 @@ public class WorkActUserServiceImpl implements WorkActUserService { UserBaseInfoResultDTO userBaseInfoResultDTO=this.queryUserBaseInfo(formDTO.getUserId()); //基本信息 resultDTO.setUserId(formDTO.getUserId()); - resultDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl()); - resultDTO.setNickName(userBaseInfoResultDTO.getNickname()); - resultDTO.setRealName(userBaseInfoResultDTO.getRealName()); + if(StringUtils.isNotBlank(userBaseInfoResultDTO.getHeadImgUrl())){ + resultDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl()); + } + if(StringUtils.isNotBlank(userBaseInfoResultDTO.getNickname())){ + resultDTO.setNickName(userBaseInfoResultDTO.getNickname()); + } + if(StringUtils.isNotBlank(userBaseInfoResultDTO.getRealName())){ + resultDTO.setRealName(userBaseInfoResultDTO.getRealName()); + } //参与活动统计值 HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId()); resultDTO.setSignInActNum(historicalActInfo.getSignInActNum());