From 0b24c883b412fd1f096c5fe3fb607a3d9b13c97e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 11 九月 2023 09:46:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 76 ++++++++++----------------------------
1 files changed, 20 insertions(+), 56 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
index 37150f6..1ec2edb 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
@@ -4,12 +4,15 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BaseGoodsMapper;
+import com.doumee.dao.business.join.BaseGoodsJoinMapper;
import com.doumee.dao.business.model.BaseGoods;
+import com.doumee.dao.business.model.Goods;
import com.doumee.service.business.BaseGoodsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +29,10 @@
@Autowired
private BaseGoodsMapper baseGoodsMapper;
+
+
+ @Autowired
+ private BaseGoodsJoinMapper baseGoodsJoinMapper;
@Override
public Integer create(BaseGoods baseGoods) {
@@ -83,76 +90,33 @@
QueryWrapper<BaseGoods> wrapper = new QueryWrapper<>(baseGoods);
return baseGoodsMapper.selectList(wrapper);
}
-
+
@Override
public PageData<BaseGoods> findPage(PageWrap<BaseGoods> pageWrap) {
IPage<BaseGoods> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<BaseGoods> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<BaseGoods> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(BaseGoods::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(BaseGoods::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(BaseGoods::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(BaseGoods::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(BaseGoods::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(BaseGoods::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(BaseGoods::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(BaseGoods::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(BaseGoods::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(BaseGoods::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(BaseGoods::getName, pageWrap.getModel().getName());
+ queryWrapper.eq(BaseGoods::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(BaseGoods::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(BaseGoods::getStatus, pageWrap.getModel().getStatus());
}
- if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(BaseGoods::getSortnum, pageWrap.getModel().getSortnum());
- }
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(BaseGoods::getImgurl, pageWrap.getModel().getImgurl());
- }
+
+
if (pageWrap.getModel().getCategoryId() != null) {
- queryWrapper.lambda().eq(BaseGoods::getCategoryId, pageWrap.getModel().getCategoryId());
+ queryWrapper.eq(BaseGoods::getCategoryId, pageWrap.getModel().getCategoryId());
}
if (pageWrap.getModel().getBrandId() != null) {
- queryWrapper.lambda().eq(BaseGoods::getBrandId, pageWrap.getModel().getBrandId());
+ queryWrapper.eq(BaseGoods::getBrandId, pageWrap.getModel().getBrandId());
}
- if (pageWrap.getModel().getZdPrice() != null) {
- queryWrapper.lambda().eq(BaseGoods::getZdPrice, pageWrap.getModel().getZdPrice());
- }
- if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.lambda().eq(BaseGoods::getPrice, pageWrap.getModel().getPrice());
- }
- if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(BaseGoods::getContent, pageWrap.getModel().getContent());
- }
- if (pageWrap.getModel().getPinyin() != null) {
- queryWrapper.lambda().eq(BaseGoods::getPinyin, pageWrap.getModel().getPinyin());
- }
- if (pageWrap.getModel().getShortPinyin() != null) {
- queryWrapper.lambda().eq(BaseGoods::getShortPinyin, pageWrap.getModel().getShortPinyin());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(baseGoodsMapper.selectPage(page, queryWrapper));
+
+ queryWrapper.orderByDesc(Goods::getId);
+ return PageData.from(baseGoodsJoinMapper.selectJoinPage(page,BaseGoods.class,queryWrapper));
}
@Override
--
Gitblit v1.9.3