userdeatil接口修改

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;
-
     /**
      * 历史活动情况
      */

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<UserHistoricalActInfoDTO> 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<>();
+    }
 }

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());
+        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());
+        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());