添加回访人返回字段

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ReturnVisitServiceImpl.java

@@ -2,20 +2,31 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.yonge.cooleshow.biz.dal.entity.ReturnVisit;
-import com.yonge.cooleshow.biz.dal.vo.ReturnVisitVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ReturnVisitSearch;
 import com.yonge.cooleshow.biz.dal.dao.ReturnVisitDao;
+import com.yonge.cooleshow.biz.dal.dto.search.ReturnVisitSearch;
+import com.yonge.cooleshow.biz.dal.entity.ReturnVisit;
+import com.yonge.cooleshow.biz.dal.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
 import com.yonge.cooleshow.biz.dal.service.ReturnVisitService;
+import com.yonge.cooleshow.biz.dal.vo.ReturnVisitVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Service
 public class ReturnVisitServiceImpl extends ServiceImpl<ReturnVisitDao, ReturnVisit> implements ReturnVisitService {
     private final static Logger log = LoggerFactory.getLogger(ReturnVisitServiceImpl.class);
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
 	@Override
     public ReturnVisitVo detail(Long id) {
         return baseMapper.detail(id);
@@ -23,7 +34,23 @@ public class ReturnVisitServiceImpl extends ServiceImpl<ReturnVisitDao, ReturnVi
     
     @Override
     public IPage<ReturnVisitVo> selectPage(IPage<ReturnVisitVo> page, ReturnVisitSearch query){
-        return page.setRecords(baseMapper.selectPage(page, query));
+        IPage<ReturnVisitVo> returnVisitVoIPage = page.setRecords(baseMapper.selectPage(page, query));
+        List<ReturnVisitVo> records =
+                returnVisitVoIPage.getRecords();
+        if (CollectionUtils.isEmpty(records)) {
+            return returnVisitVoIPage;
+        }
+        List<Long> collect = records.stream().map(ReturnVisitVo::getCreateBy).collect(Collectors.toList());
+
+
+        List<SysUser> sysUsers = sysUserMapper.selectBatchIds(collect);
+        Map<Long, String> userIdMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getId, SysUser::getUsername));
+
+        for (ReturnVisitVo record : records) {
+            record.setVisitUsername(userIdMap.get(record.getCreateBy()));
+        }
+        returnVisitVoIPage.setRecords(records);
+        return returnVisitVoIPage;
     }
 	
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ReturnVisitVo.java

@@ -20,6 +20,17 @@ public class ReturnVisitVo extends ReturnVisit{
 	@ApiModelProperty("手机号")
 	private String phone;
 
+	@ApiModelProperty("回访人， 谁回访的")
+	private String visitUsername;
+
+	public String getVisitUsername() {
+		return visitUsername;
+	}
+
+	public void setVisitUsername(String visitUsername) {
+		this.visitUsername = visitUsername;
+	}
+
 	public String getPhone() {
 		return phone;
 	}