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 906389cd..fbc61268 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 @@ -53,29 +53,7 @@ public class BmsChannelPointController { @PreAuthorize("hasRole('bms:channelPoint:query')") public R> getPage(BmsChannelPoint param){ PageUtil.startPage(); - LambdaQueryWrapper channelPointWrapper = new LambdaQueryWrapper<>(); - if(StringUtils.hasText(param.getChannelName())){ - channelPointWrapper.like(BmsChannelPoint::getChannelName,param.getChannelName()); - } - if(StringUtils.hasText(param.getPointName())){ - channelPointWrapper.like(BmsChannelPoint::getPointName,param.getPointName()); - } - if(StringUtils.hasText(param.getPointCode())){ - channelPointWrapper.like(BmsChannelPoint::getPointCode,param.getPointCode()); - } - if(StringUtils.hasText(param.getBizRegionPath())){ - channelPointWrapper.like(BmsChannelPoint::getBizRegionPath,param.getBizRegionPath()); - } - if(StringUtils.hasText(param.getSaleRegionPath())){ - channelPointWrapper.like(BmsChannelPoint::getSaleRegionPath,param.getSaleRegionPath()); - } - if(StringUtils.hasText(param.getPointType())){ - channelPointWrapper.eq(BmsChannelPoint::getPointType,param.getPointType()); - } - if(StringUtils.hasText(param.getPointLevel())){ - channelPointWrapper.eq(BmsChannelPoint::getPointLevel,param.getPointLevel()); - } - List list = bmsChannelPointService.list(channelPointWrapper); + List list = bmsChannelPointService.selectChannelPointList(param); for (BmsChannelPoint channelPoint : list) { if(StringUtils.hasText(channelPoint.getBizRegionPath())){ String[] bizRegions = channelPoint.getBizRegionPath().split("_"); 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 900ad943..420dde33 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 @@ -126,5 +126,8 @@ public class BmsChannelPoint implements Serializable { @TableField(exist = false) private String bizRegionName; + + @TableField(exist = false) + private String supplierId; } diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java index b90287fa..bc40a862 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java @@ -1,5 +1,7 @@ package com.qs.serve.modules.bms.mapper; + +import java.util.List; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.bms.entity.BmsChannelPoint; @@ -20,5 +22,8 @@ public interface BmsChannelPointMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "1") @Update("update bms_channel_point set biz_region_path = #{bizRegionPath} where biz_region_id = #{bizRegionId}") int udpateBizRegionPathByBizRegionId(@Param("bizRegionPath") String bizRegionPath,String bizRegionId); + + List selectChannelPointList(@Param("query") BmsChannelPoint channelPoint); + } diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java index 245b4cfc..53973bdc 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.bms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.modules.bms.entity.BmsChannelPoint; import com.qs.serve.modules.bms.entity.bo.BmsChannelPointBo; +import org.apache.ibatis.annotations.Param; import java.util.Collection; import java.util.List; @@ -16,6 +17,8 @@ public interface BmsChannelPointService extends IService { boolean modify(BmsChannelPointBo param); + List selectChannelPointList(BmsChannelPoint channelPoint); + List listByBizRegionId(String id); List listBySaleRegionId(String id); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java index d50ba4d7..6c8c1ffd 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java @@ -59,6 +59,11 @@ public class BmsChannelPointServiceImpl extends ServiceImpl selectChannelPointList(BmsChannelPoint channelPoint) { + return baseMapper.selectChannelPointList(channelPoint); + } + @Override public List listByBizRegionId(String id) { LambdaQueryWrapper channelPointWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml new file mode 100644 index 00000000..4e254213 --- /dev/null +++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bms_channel_point.`id`, + bms_channel_point.`channel_id`, + bms_channel_point.`channel_name`, + bms_channel_point.`point_code`, + bms_channel_point.`point_name`, + bms_channel_point.`shop_area`, + bms_channel_point.`count_checkstand`, + bms_channel_point.`point_level`, + bms_channel_point.`point_type`, + bms_channel_point.`address`, + bms_channel_point.`sale_region_id`, + bms_channel_point.`sale_region_path`, + bms_channel_point.`sale_region_path_ids`, + bms_channel_point.`biz_region_id`, + bms_channel_point.`biz_region_path`, + bms_channel_point.`biz_region_path_ids`, + bms_channel_point.`remark`, + bms_channel_point.`create_time`, + bms_channel_point.`update_time`, + bms_channel_point.`tenant_id`, + bms_channel_point.`del_flag`, + bms_channel_point.`create_by`, + bms_channel_point.`update_by` + + + +