|
|
|
@@ -922,6 +922,10 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
List<WxBusiness> businesses = businessService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); |
|
|
|
Map<Integer, WxBusiness> businesseMap = getMap(businesses, WxBusiness::getId); |
|
|
|
|
|
|
|
//业态信息 |
|
|
|
List<WxShop> shopList = shopService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); |
|
|
|
Map<Long, WxShop> shopMap = getMap(shopList, WxShop::getId); |
|
|
|
|
|
|
|
List<InvestOperateRecordVo> resultList = new ArrayList<>(); |
|
|
|
for (InvestOperateRecordEntity recordEntity : recordList) { |
|
|
|
InvestOperateRecordVo itemVo = new InvestOperateRecordVo(); |
|
|
|
@@ -960,6 +964,15 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
if (Objects.nonNull(userAfter)) { |
|
|
|
tableTriple.setAfter(userAfter.getName()); |
|
|
|
} |
|
|
|
} else if (Objects.equals(column, "targetId")) { |
|
|
|
WxShop shopBefore = shopMap.get(tableTriple.getBefore()); |
|
|
|
WxShop shopAfter = shopMap.get(tableTriple.getAfter()); |
|
|
|
if (Objects.nonNull(shopBefore)) { |
|
|
|
tableTriple.setBefore(shopBefore.getShopNumber()); |
|
|
|
} |
|
|
|
if (Objects.nonNull(shopAfter)) { |
|
|
|
tableTriple.setAfter(shopAfter.getShopNumber()); |
|
|
|
} |
|
|
|
} |
|
|
|
return tableTriple; |
|
|
|
})); |
|
|
|
|