From 0b341ace8224a6af352bc47a40e392d5c1f653f1 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 7 Aug 2023 11:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=A0=E9=81=93PAGE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsChannelController.java | 23 ++++++++++++++++ .../controller/my/BmsChannelMyController.java | 27 +++++++++++++------ .../serve/modules/bms/entity/BmsChannel.java | 2 ++ .../resources/mapper/bms/BmsChannelMapper.xml | 3 +++ 4 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java index de040cee..3ac7f7ba 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java @@ -113,11 +113,34 @@ public class BmsChannelController { if(param.getLoadByCurrent()!=null&¶m.getLoadByCurrent().equals(1)){ return bmsChannelMyController.getPage4UnderAndMine(param); } + + LambdaQueryWrapper channelWrapper = new LambdaQueryWrapper<>(param); channelWrapper.orderByDesc(BmsChannel::getCreateTime); + + if(StringUtils.hasText(param.getSeachSupplierName())){ + BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel(); + searchSupplierChannel.setSupplierName(param.getSeachSupplierName()); + List bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel); + List channelIds = bmsSupplierChannelList.stream().map(a->a.getChannelId()).collect(Collectors.toList()); + if(channelIds.size()>0) { + channelWrapper.in(BmsChannel::getId, channelIds); + }else{ + channelWrapper.eq(BmsChannel::getId, 0L); + } + } + PageUtil.startPage(); List list = bmsChannelService.list(channelWrapper); + + list.forEach(a->{ + BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel(); + searchSupplierChannel.setChannelId(a.getId()); + List bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel); + a.setSupplierNames(bmsSupplierChannelList.stream().map(b->b.getSupplierName()).collect(Collectors.toList())); + }); + return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java index 536c26fe..18eb9b18 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java @@ -11,15 +11,9 @@ import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.StringUtils; import com.qs.serve.modules.bms.common.MasterUserType; -import com.qs.serve.modules.bms.entity.BmsChannel; -import com.qs.serve.modules.bms.entity.BmsChannelPoint; -import com.qs.serve.modules.bms.entity.BmsMasterUser; -import com.qs.serve.modules.bms.entity.BmsRegionUser; +import com.qs.serve.modules.bms.entity.*; import com.qs.serve.modules.bms.mapper.BmsMasterUserMapper; -import com.qs.serve.modules.bms.service.BmsChannelPointService; -import com.qs.serve.modules.bms.service.BmsChannelService; -import com.qs.serve.modules.bms.service.BmsMasterUserService; -import com.qs.serve.modules.bms.service.BmsRegionUserService; +import com.qs.serve.modules.bms.service.*; import com.qs.serve.modules.his.entity.HisUserChannelPoint; import com.qs.serve.modules.his.service.HisUserChannelPointService; import com.qs.serve.modules.sys.service.SysPostUserService; @@ -50,6 +44,7 @@ public class BmsChannelMyController { private BmsChannelService bmsChannelService; private BmsMasterUserService bmsMasterUserService; private SysPostUserService postUserService; + private BmsSupplierChannelService bmsSupplierChannelService; /** * 翻页(我负责的) @@ -91,8 +86,24 @@ public class BmsChannelMyController { String loginUserId = AuthContextUtils.getSysUserId(); List userIds = postUserService.listByChildIds(loginUserId); userIds.add(loginUserId); + +// if(StringUtils.hasText(param.getSeachSupplierName())){ +// BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel(); +// searchSupplierChannel.setSupplierName(param.getSeachSupplierName()); +// List bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel); +// List supplierIds = bmsSupplierChannelList.stream().map(a->a.getSupplierId()).collect(Collectors.toList()); +// param.setSupplierIds(supplierIds); +// } + PageUtil.startPage(); List list = bmsChannelService.selectChannelList(param, userIds,param.getSupplierIdForFindChild()); + + list.forEach(a->{ + BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel(); + searchSupplierChannel.setChannelId(a.getId()); + List bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel); + a.setSupplierNames(bmsSupplierChannelList.stream().map(b->b.getSupplierName()).collect(Collectors.toList())); + }); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java index 0f019ef5..2893a66e 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java @@ -123,5 +123,7 @@ public class BmsChannel implements Serializable { @TableField(exist = false) private List supplierNames; + @TableField(exist = false) + private String seachSupplierName; } diff --git a/src/main/resources/mapper/bms/BmsChannelMapper.xml b/src/main/resources/mapper/bms/BmsChannelMapper.xml index 3c0e0d80..3362c723 100644 --- a/src/main/resources/mapper/bms/BmsChannelMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelMapper.xml @@ -48,6 +48,9 @@ #{selectId} and bms_supplier_channel.supplier_id = #{supplierId} + + and `his_user_supplier`.`supplier_name` like concat('%',#{query.seachSupplierName},'%') + and `bms_supplier_channel`.`del_flag` = 0 GROUP BY channel_id ) tmp