huanglizhi 11 meses atrás
pai
commit
fdacd5989e

+ 1 - 1
module-erp/src/main/java/com/hys/app/controller/erp/use/ProductManagerController.java

@@ -39,7 +39,7 @@ public class ProductManagerController {
 
     @ApiOperation(value = "分页列表")
     @GetMapping
-    public WebPage<ProductVO> list(ProductQueryParams queryParams) {
+    public IPage<ProductDO> list(ProductQueryParams queryParams) {
         AdminUserContext.hasSuperAdminQuery(queryParams.getCompanyId());
         return productManager.list(queryParams);
     }

+ 2 - 1
module-erp/src/main/java/com/hys/app/service/erp/ProductManager.java

@@ -1,5 +1,6 @@
 package com.hys.app.service.erp;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.framework.database.mybatisplus.base.BaseService;
@@ -25,7 +26,7 @@ public interface ProductManager extends BaseService<ProductDO> {
      * @param queryParams 查询条件
      * @return 分页数据
      */
-    WebPage<ProductVO> list(ProductQueryParams queryParams);
+    IPage<ProductDO> list(ProductQueryParams queryParams);
 
     /**
      * 查询详情

+ 13 - 2
module-erp/src/main/java/com/hys/app/service/erp/impl/ProductManagerImpl.java

@@ -3,7 +3,10 @@ package com.hys.app.service.erp.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 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.hys.app.framework.context.user.AdminUserContext;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.framework.database.mybatisplus.base.BaseServiceImpl;
@@ -33,8 +36,16 @@ public class ProductManagerImpl extends BaseServiceImpl<ProductMapper, ProductDO
 
     private ProductStockManager productStockManager;
     @Override
-    public WebPage<ProductVO> list(ProductQueryParams queryParams) {
-                    return null;
+    public IPage<ProductDO> list(ProductQueryParams queryParams) {
+       return page(new Page<>(queryParams.getPageNo(), queryParams.getPageSize()), new LambdaQueryWrapper<ProductDO>()
+                .and(StrUtil.isNotBlank(queryParams.getKeyword()), item -> item.like(ProductDO::getName, queryParams.getName())
+                        .or()
+                        .like(ProductDO::getSku, queryParams.getKeyword())
+                        .or()
+                        .like(ProductDO::getBrand, queryParams.getKeyword())
+                        .or()
+                        .like(ProductDO::getBarCode, queryParams.getKeyword())));
+
     }
 
     @Override