From 2ea178e9e2ccdda46f2bde11cd812f9179965424 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 7 Aug 2023 16:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=82=B9=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AE=A2=E6=88=B7=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 | 4 ++++ .../controller/BmsChannelPointController.java | 16 ++++++++++++++++ .../my/BmsChannelPointMyController.java | 6 ++++++ .../modules/bms/entity/BmsChannelPoint.java | 8 ++++++++ .../mapper/bms/BmsChannelPointMapper.xml | 16 ++++++++++++++-- 5 files changed, 48 insertions(+), 2 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 3ac7f7ba..7c9039ea 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 @@ -175,6 +175,10 @@ public class BmsChannelController { param.setHeadChannel(headChannel.getChannelName()); param.setHeadChannelCode(headChannel.getChannelCode()); } + }else{ + param.setHeadChannelId(0L); + param.setHeadChannel(""); + param.setHeadChannelCode(""); } boolean result = bmsChannelService.updateById(param); if(!ori.getChannelName().equals(param.getChannelName())){ diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java index dd81ff63..a86578d3 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java @@ -64,6 +64,7 @@ public class BmsChannelPointController { private SysPostUserService postUserService; private BmsChannelPointMyController bmsChannelPointMyController; private BmsChannelService bmsChannelService; + private BmsSupplierChannelService bmsSupplierChannelService; /** * 导出 @@ -163,6 +164,15 @@ public class BmsChannelPointController { if(param.getLoadByCurrent()!=null&¶m.getLoadByCurrent().equals(1)){ return bmsChannelPointMyController.page4UnderAndMine(param); } + + 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()); + param.setSeachChannelIds(channelIds); + } + PageUtil.startPage(); List list = bmsChannelPointService.selectChannelPointList(param); List bizRegionIds = new ArrayList<>(); @@ -193,6 +203,12 @@ public class BmsChannelPointController { channelPoint.setSaleRegionName(regions[regions.length-1]); } } + + BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel(); + searchSupplierChannel.setChannelId(channelPoint.getChannelId()); + List bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel); + channelPoint.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/BmsChannelPointMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java index 92a1aee3..63a93dfe 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java @@ -60,6 +60,7 @@ public class BmsChannelPointMyController { private BmsRegionUserService bmsRegionUserService; private SysPostUserService postUserService; private BmsMasterUserService bmsMasterUserService; + private BmsSupplierChannelService bmsSupplierChannelService; /** @@ -167,6 +168,11 @@ public class BmsChannelPointMyController { channelPoint.setSaleRegionName(regions[regions.length-1]); } } + BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel(); + searchSupplierChannel.setChannelId(channelPoint.getChannelId()); + List bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel); + channelPoint.setSupplierNames(bmsSupplierChannelList.stream().map(b->b.getSupplierName()).collect(Collectors.toList())); + } return R.byPageList(count,pageList); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java index 0b8b64bc..7f19a0fd 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java @@ -209,5 +209,13 @@ public class BmsChannelPoint implements Serializable { @TableField(exist = false) private String channelType; + @TableField(exist = false) + private String seachSupplierName; + + @TableField(exist = false) + private List seachChannelIds; + + @TableField(exist = false) + private List supplierNames; } diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml index 955361b1..77d8e889 100644 --- a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml @@ -76,6 +76,12 @@ and bms_supplier_channel.`supplier_id` = #{query.supplierId} and bms_supplier_channel.`del_flag` = 0 + + and `bms_channel_point`.`channel_id` in + + #{selectId} + + and `bms_channel_point`.`id` = #{query.id} and `bms_channel_point`.`channel_id` = #{query.channelId} and `bms_channel_point`.`channel_name` like concat('%',#{query.channelName},'%') @@ -279,13 +285,16 @@