From 94d62329d19c9fcceb06c4ac548fc270604601c0 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 12 Jun 2025 11:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=95=86=E5=9F=8E=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/supermarket/dto/SmSpuPageDTO.java | 10 +++++++++ .../controller/SmSpuController.java | 3 ++- .../supermarket/mapper/SmSpuMapper.java | 3 ++- .../supermarket/service/SmSpuService.java | 3 ++- .../service/impl/SmSpuServiceImpl.java | 3 ++- .../src/main/resources/mapper/SmSpuMapper.xml | 22 ++++++++++++++----- 6 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SmSpuPageDTO.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SmSpuPageDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SmSpuPageDTO.java new file mode 100644 index 000000000..fcf3506a4 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SmSpuPageDTO.java @@ -0,0 +1,10 @@ +package com.bsd.pjcloud.supermarket.dto; + + +import lombok.Data; + +@Data +public class SmSpuPageDTO { + + private String productName; +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java index 02826db54..f59e9be36 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java @@ -12,6 +12,7 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO; import com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; @@ -69,7 +70,7 @@ public class SmSpuController { @Operation(summary = "分页查询" , description = "分页查询" ) @GetMapping("/page" ) @PreAuthorize("@pms.hasPermission('supermarket_smSpu_view')" ) - public R getSmSpuPage(@ParameterObject Page page, @ParameterObject SmSpuEntity smSpu) { + public R getSmSpuPage(@ParameterObject Page page, @ParameterObject SmSpuPageDTO smSpu) { return R.ok(smSpuService.pageScope(page, smSpu)); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java index c9d4fa95b..fc02839ec 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; import com.bsd.pjcloud.supermarket.vo.OnlineShopVo; @@ -26,7 +27,7 @@ public interface SmSpuMapper extends PjcloudBaseMapper { * @param of * @return */ - IPage selectSmErpPageScopeVo(Page page, @Param("smspu") SmSpuEntity smSpu, DataScope of); + IPage selectSmErpPageScopeVo(Page page, @Param("smspu") SmSpuPageDTO smSpu, DataScope of); /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java index 7b0d5da1d..32f5dcca5 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; import com.bsd.pjcloud.supermarket.vo.OnlineShopVo; @@ -15,7 +16,7 @@ public interface SmSpuService extends IService { - Object pageScope(Page page, SmSpuEntity smSpu); + Object pageScope(Page page, SmSpuPageDTO smSpu); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java index c0673d5a1..85db26a6d 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper; @@ -39,7 +40,7 @@ public class SmSpuServiceImpl extends ServiceImpl impl private final SmErpUnitMapper smErpUnitMapper; @Override - public Object pageScope(Page page, SmSpuEntity smSpu) { + public Object pageScope(Page page, SmSpuPageDTO smSpu) { IPage pageData = baseMapper.selectSmErpPageScopeVo(page,smSpu, DataScope.of()); return pageData; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml index 8c3204bdb..a1d96d1d3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml @@ -30,7 +30,13 @@ on sp.erp_spu_id = esp.id left join sm_erp_category eca on esp.category_id = eca.id - where sp.del_flag = 0 + + esp.del_flag = 0 and sp.del_flag = 0 + + and esp.product_name like concat('%', #{smspu.productName}, '%') + + + \ No newline at end of file