|
@@ -1,6 +1,7 @@
|
|
|
package com.hys.app.service.erp.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
@@ -140,7 +141,10 @@ public class GoodsSnManagerImpl extends BaseServiceImpl<GoodsSnMapper, GoodsSnDO
|
|
|
public Page<ProductVO> getSnProduct(GoodsSnQueryParams queryParams) {
|
|
|
Page<ProductDO> page = productManager.page(new Page<>(queryParams.getPageNo(), queryParams.getPageSize()), new LambdaQueryWrapper<ProductDO>()
|
|
|
.eq(ProductDO::getHaveSn, true)
|
|
|
- .like(StrUtil.isNotBlank(queryParams.getSku()), ProductDO::getSku, queryParams.getSku()));
|
|
|
+ .like(StrUtil.isNotBlank(queryParams.getSku()), ProductDO::getSku, queryParams.getSku())
|
|
|
+ //add by mzhu
|
|
|
+ .like(StrUtil.isNotBlank(queryParams.getName()), ProductDO::getName, queryParams.getName())
|
|
|
+ );
|
|
|
|
|
|
Page<ProductVO> convert = productConverter.convert(page);
|
|
|
for (ProductVO record : convert.getRecords()) {
|
|
@@ -189,13 +193,30 @@ public class GoodsSnManagerImpl extends BaseServiceImpl<GoodsSnMapper, GoodsSnDO
|
|
|
|
|
|
@Override
|
|
|
public WebPage<GoodsSnVO> list(GoodsSnQueryParams queryParams) {
|
|
|
- WebPage<GoodsSnDO> webPage = baseMapper.selectPage(queryParams);
|
|
|
- WebPage<GoodsSnVO> webPage1 = converter.convert(webPage);
|
|
|
- for (GoodsSnVO goodsSnVO : webPage1.getData()) {
|
|
|
- goodsSnVO.setGoodsVO(goodsManager.getById(goodsSnVO.getGoodsId()));
|
|
|
- goodsSnVO.setProductVO(productManager.getById(goodsSnVO.getProductId()));
|
|
|
- }
|
|
|
+// WebPage<GoodsSnDO> webPage = baseMapper.selectPage(queryParams);
|
|
|
+// WebPage<GoodsSnVO> webPage1 = converter.convert(webPage);
|
|
|
+// for (GoodsSnVO goodsSnVO : webPage1.getData()) {
|
|
|
+// goodsSnVO.setGoodsVO(goodsManager.getById(goodsSnVO.getGoodsId()));
|
|
|
+// goodsSnVO.setProductVO(productManager.getById(goodsSnVO.getProductId()));
|
|
|
+// }
|
|
|
+//
|
|
|
+// return webPage1;
|
|
|
|
|
|
+ WebPage<GoodsSnVO> webPage1 = new WebPage<>();
|
|
|
+ List<GoodsSnDO> listGoodsSnDO = baseMapper.selectProductSnPage(queryParams);
|
|
|
+ if(CollectionUtil.isNotEmpty(listGoodsSnDO)) {
|
|
|
+ Long recordCount= baseMapper.selectProductSnPageCount(queryParams);
|
|
|
+ WebPage<GoodsSnDO> webPage=new WebPage<>();
|
|
|
+ webPage.setPageSize(queryParams.getPageSize());
|
|
|
+ webPage.setPageNo(queryParams.getPageNo());
|
|
|
+ webPage.setDataTotal(recordCount);
|
|
|
+ webPage.setData(listGoodsSnDO);
|
|
|
+ webPage1 = converter.convert(webPage);
|
|
|
+ for (GoodsSnVO goodsSnVO : webPage1.getData()) {
|
|
|
+ goodsSnVO.setGoodsVO(goodsManager.getById(goodsSnVO.getGoodsId()));
|
|
|
+ goodsSnVO.setProductVO(productManager.getById(goodsSnVO.getProductId()));
|
|
|
+ }
|
|
|
+ }
|
|
|
return webPage1;
|
|
|
}
|
|
|
}
|