From 8e43d12b3e44389c57b219115ab7fdbaa7d2494b Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 28 Oct 2019 17:28:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86][=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86]=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/invest/impl/InvestBizServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 2ae0aea71..539a4dd01 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -922,6 +922,10 @@ public class InvestBizServiceImpl implements InvestBizService { List businesses = businessService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); Map businesseMap = getMap(businesses, WxBusiness::getId); + //业态信息 + List shopList = shopService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); + Map shopMap = getMap(shopList, WxShop::getId); + List 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; }));