|
|
@ -5,7 +5,9 @@ import com.qs.serve.common.util.CollectionUtil; |
|
|
|
import com.qs.serve.common.util.CopierUtil; |
|
|
|
import com.qs.serve.modules.seeyon.entity.CtpAffair; |
|
|
|
import com.qs.serve.modules.seeyon.service.SeeYonRequestService; |
|
|
|
import com.qs.serve.modules.sys.entity.SysPostUser; |
|
|
|
import com.qs.serve.modules.sys.entity.SysUser; |
|
|
|
import com.qs.serve.modules.sys.service.SysPostUserService; |
|
|
|
import com.qs.serve.modules.sys.service.SysUserService; |
|
|
|
import com.qs.serve.modules.tbs.common.TbsActivityState; |
|
|
|
import com.qs.serve.modules.tbs.common.TbsSeeYonConst; |
|
|
@ -33,6 +35,7 @@ import java.math.BigDecimal; |
|
|
|
import java.time.LocalDateTime; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
@ -48,6 +51,7 @@ public class VtbVerificationApplication { |
|
|
|
private VtbVerificationYardService yardService; |
|
|
|
private VtbVerificationYardItemService yardItemService; |
|
|
|
private final TbsActivityPayConditionService activityPayConditionService; |
|
|
|
private SysPostUserService sysPostUserService; |
|
|
|
|
|
|
|
private TbsActivityService tbsActivityService; |
|
|
|
private TbsCostApplyService tbsCostApplyService; |
|
|
@ -315,6 +319,12 @@ public class VtbVerificationApplication { |
|
|
|
costApplyList = tbsCostApplyService.listByIds(costIds); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); |
|
|
|
List<SysPostUser> postUserList = sysPostUserService.listByUserIds(userIds); |
|
|
|
Map<String,List<SysPostUser>> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId)); |
|
|
|
|
|
|
|
List<CtpAffairVo> result = new ArrayList<>(); |
|
|
|
for (CtpAffair ctpAffair : ctpAffairs) { |
|
|
|
CtpAffairVo ctpAffairVo = new CtpAffairVo(); |
|
|
@ -341,6 +351,16 @@ public class VtbVerificationApplication { |
|
|
|
ctpAffairVo.setUserInfo(user.toSysUserVo()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
ctpAffairVo.setAffairInfo(ctpAffair); |
|
|
|
for (SysUser user : userList) { |
|
|
|
if(ctpAffair.getMemberId().equals(user.getSyUserId())){ |
|
|
|
ctpAffairVo.setUserInfo(user.toSysUserVo()); |
|
|
|
List<SysPostUser> postUsers = postMap.get(user.getId()); |
|
|
|
ctpAffairVo.setUserPostList(postUsers); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
ctpAffairVo.setAffairInfo(ctpAffair); |
|
|
|
result.add(ctpAffairVo); |
|
|
|
} |
|
|
|