diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index f36a6e4f..0e8be7e7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -543,6 +543,7 @@ public class TbsActivityServiceImpl extends ServiceImpl> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId)); List result = new ArrayList<>(); + DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class); + SysAttachMapper sysAttachMapper = SpringUtils.getBean(SysAttachMapper.class); + List affairCommits = dataAffairCommitMapper.selectBatchIds(ctpAffairs.stream() + .map(CtpAffair::getAffairId).collect(Collectors.toList())); for (CtpAffair ctpAffair : ctpAffairs) { CtpAffairVo ctpAffairVo = new CtpAffairVo(); for (VtbVerification verification : vtbVerificationList) { @@ -427,7 +433,16 @@ public class VtbVerificationApplication { ctpAffairVo.setUserPostList(postUsers); } } - + for (DataAffairCommit affairCommit : affairCommits) { + if(affairCommit.getId().equals(ctpAffair.getAffairId())){ + ctpAffairVo.setCommitInfo(affairCommit); + if(CollectionUtil.isNotEmpty(affairCommit.getAttachIds())){ + ctpAffairVo.setAttachments( + sysAttachMapper.selectBatchIds( + Arrays.asList(affairCommit.getAttachIds()))); + } + } + } ctpAffairVo.setAffairInfo(ctpAffair); result.add(ctpAffairVo); }