diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java index 0961a5e4f..a8f7e56d5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java @@ -3,9 +3,10 @@ package com.ruoyi.web.controller.xkt; import cn.hutool.core.bean.BeanUtil; import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; -import com.ruoyi.web.controller.xkt.vo.storePordColor.StoreProdColorResVO; +import com.ruoyi.common.core.page.Page; import com.ruoyi.web.controller.xkt.vo.storePordColor.StoreProdColorSnResVO; import com.ruoyi.web.controller.xkt.vo.storePordColor.StoreProductColorFuzzyPageVO; +import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorResDTO; import com.ruoyi.xkt.dto.storeProdColor.StoreProductColorFuzzyPageDTO; import com.ruoyi.xkt.service.IStoreProductColorService; import io.swagger.annotations.Api; @@ -31,8 +32,8 @@ public class StoreProductColorController extends XktBaseController { @ApiOperation(value = "模糊查询档口所有的商品颜色分类", httpMethod = "POST", response = R.class) @PostMapping(value = "/fuzzy") - public R> fuzzyQueryColorList(@RequestBody StoreProductColorFuzzyPageVO pageVO) { - return success(BeanUtil.copyToList(storeProdColorService.fuzzyQueryColorList(BeanUtil.toBean(pageVO, StoreProductColorFuzzyPageDTO.class)), StoreProdColorResVO.class)); + public R> fuzzyQueryPage(@RequestBody StoreProductColorFuzzyPageVO pageVO) { + return R.ok(storeProdColorService.fuzzyQueryPage(BeanUtil.toBean(pageVO, StoreProductColorFuzzyPageDTO.class))); } @ApiOperation(value = "根据商品ID查询颜色及已设置颜色条码", httpMethod = "GET", response = R.class) diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java index 5bb29364d..9a239ceea 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java @@ -53,7 +53,7 @@ public interface StoreProductColorMapper extends BaseMapper { * @param pageDTO 查询入参 * @return List */ - List fuzzyQueryColorList(StoreProductColorFuzzyPageDTO pageDTO); + List fuzzyQueryPage(StoreProductColorFuzzyPageDTO pageDTO); /** * 获取商品颜色价格列表 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductColorService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductColorService.java index 0694a59b0..02a51f64a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductColorService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductColorService.java @@ -22,7 +22,7 @@ public interface IStoreProductColorService { * @param pageDTO 查询入参 * @return 返回一个列表,包含匹配的产品颜色信息 */ - List fuzzyQueryColorList(StoreProductColorFuzzyPageDTO pageDTO); + Page fuzzyQueryPage(StoreProductColorFuzzyPageDTO pageDTO); /** * 获取档口某个商品所有颜色对应的价格等 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductColorServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductColorServiceImpl.java index 171c86cb2..0c82ca844 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductColorServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductColorServiceImpl.java @@ -51,8 +51,10 @@ public class StoreProductColorServiceImpl implements IStoreProductColorService { */ @Override @Transactional(readOnly = true) - public List fuzzyQueryColorList(StoreProductColorFuzzyPageDTO pageDTO) { - return storeProdColorMapper.fuzzyQueryColorList(pageDTO); + public Page fuzzyQueryPage(StoreProductColorFuzzyPageDTO pageDTO) { + PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize()); + List fuzzyQueryList = storeProdColorMapper.fuzzyQueryPage(pageDTO); + return CollectionUtils.isEmpty(fuzzyQueryList) ? Page.empty(pageDTO.getPageSize(), pageDTO.getPageNum()) : Page.convert(new PageInfo<>(fuzzyQueryList)); } /** diff --git a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml index 2f8ade377..7c1932dae 100644 --- a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spc.create_time DESC - SELECT DISTINCT spc.id AS storeProdColorId, sp.store_id AS storeId,