渠道PAGE添加查询条件

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java

@@ -113,11 +113,34 @@ public class BmsChannelController {
         if(param.getLoadByCurrent()!=null&&param.getLoadByCurrent().equals(1)){
             return bmsChannelMyController.getPage4UnderAndMine(param);
         }
+
+
         LambdaQueryWrapper<BmsChannel> channelWrapper = new LambdaQueryWrapper<>(param);
         channelWrapper.orderByDesc(BmsChannel::getCreateTime);
 
+
+        if(StringUtils.hasText(param.getSeachSupplierName())){
+            BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel();
+            searchSupplierChannel.setSupplierName(param.getSeachSupplierName());
+            List<BmsSupplierChannel> bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel);
+            List<Long> 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<BmsChannel> list = bmsChannelService.list(channelWrapper);
+
+        list.forEach(a->{
+            BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel();
+            searchSupplierChannel.setChannelId(a.getId());
+            List<BmsSupplierChannel> bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel);
+            a.setSupplierNames(bmsSupplierChannelList.stream().map(b->b.getSupplierName()).collect(Collectors.toList()));
+        });
+
         return R.byPageHelperList(list);
     }
 

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.*;
-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.mapper.BmsMasterUserMapper;
-import com.qs.serve.modules.bms.service.BmsChannelPointService;
+import com.qs.serve.modules.bms.service.*;
-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.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<String> userIds = postUserService.listByChildIds(loginUserId);
         userIds.add(loginUserId);
+
+//        if(StringUtils.hasText(param.getSeachSupplierName())){
+//            BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel();
+//            searchSupplierChannel.setSupplierName(param.getSeachSupplierName());
+//            List<BmsSupplierChannel> bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel);
+//            List<Long> supplierIds = bmsSupplierChannelList.stream().map(a->a.getSupplierId()).collect(Collectors.toList());
+//            param.setSupplierIds(supplierIds);
+//        }
+
         PageUtil.startPage();
         List<BmsChannel> list = bmsChannelService.selectChannelList(param, userIds,param.getSupplierIdForFindChild());
+
+        list.forEach(a->{
+            BmsSupplierChannel searchSupplierChannel = new BmsSupplierChannel();
+            searchSupplierChannel.setChannelId(a.getId());
+            List<BmsSupplierChannel> bmsSupplierChannelList = bmsSupplierChannelService.selectSupplierChannelList(searchSupplierChannel);
+            a.setSupplierNames(bmsSupplierChannelList.stream().map(b->b.getSupplierName()).collect(Collectors.toList()));
+        });
         return R.byPageHelperList(list);
     }
 

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<String> supplierNames;
 
+    @TableField(exist = false)
+    private String seachSupplierName;
 }
 

src/main/resources/mapper/bms/BmsChannelMapper.xml

@@ -48,6 +48,9 @@
                 #{selectId}
             </foreach>
             <if test="supplierId != null and supplierId != ''"> and bms_supplier_channel.supplier_id  = #{supplierId}</if>
+            <if test="query.seachSupplierName != null and query.seachSupplierName!=''">
+                and `his_user_supplier`.`supplier_name` like concat('%',#{query.seachSupplierName},'%')
+            </if>
             and `bms_supplier_channel`.`del_flag` = 0
             GROUP BY channel_id
         ) tmp