Commit 3d07337d authored by zp's avatar zp

自选

parent 4bc264b8
...@@ -172,6 +172,8 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan ...@@ -172,6 +172,8 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
List<String> fundIds = managerMappings.stream().map(FundManagerMapping::getFundId).distinct() List<String> fundIds = managerMappings.stream().map(FundManagerMapping::getFundId).distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
fundIds.add(id);
FundCountExample example2 = new FundCountExample(); FundCountExample example2 = new FundCountExample();
example2.createCriteria() example2.createCriteria()
.andFundIdIn(fundIds) .andFundIdIn(fundIds)
...@@ -236,14 +238,15 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan ...@@ -236,14 +238,15 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
vo.setInceptionDate(LongUtil.timeLong(fundInfo.getInceptionDate())); vo.setInceptionDate(LongUtil.timeLong(fundInfo.getInceptionDate()));
} }
// 设置代表基金id 其他基金信息 // 设置代表基金id 其他基金信息
getDelegateById(i.getId(), map, infoMap, fundCountMap, vo); getDelegateById(i.getId(), map, infoMap, fundCountMap, vo, isCheckSet);
} }
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
private void getDelegateById(String personalId, Map<String, List<FundManagerMapping>> map, private void getDelegateById(String personalId, Map<String, List<FundManagerMapping>> map,
Map<String, FundInfo> infoMap, Map<String, FundCount> fundCountMap, FundManagerVO vo) { Map<String, FundInfo> infoMap, Map<String, FundCount> fundCountMap,
FundManagerVO vo, Set<String> isCheckSet) {
if (CollectionUtils.isNotEmpty(map.get(personalId))) { if (CollectionUtils.isNotEmpty(map.get(personalId))) {
List<FundManagerMapping> mappings = map.get(personalId); List<FundManagerMapping> mappings = map.get(personalId);
...@@ -266,6 +269,7 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan ...@@ -266,6 +269,7 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
vo.setFundInfoVOS(list.stream().map(l -> { vo.setFundInfoVOS(list.stream().map(l -> {
FundInfoVO infoVO = new FundInfoVO(); FundInfoVO infoVO = new FundInfoVO();
String fundId = l.getFundId(); String fundId = l.getFundId();
infoVO.setIsCheck(isCheckSet.contains(fundId) ? 1 : 0);
infoVO.setFundId(fundId); infoVO.setFundId(fundId);
if (infoMap.get(fundId) != null) { if (infoMap.get(fundId) != null) {
FundInfo fundInfo = infoMap.get(fundId); FundInfo fundInfo = infoMap.get(fundId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment