From 947f4fc58f3a7f4c4cb12062afcf851b439a53f1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 13 十月 2023 18:49:23 +0800
Subject: [PATCH] #获取可退款信息
---
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java | 66 +++++++++++---------------------
1 files changed, 23 insertions(+), 43 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
index af86451..22f6c64 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
@@ -4,13 +4,18 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.LocksMapper;
+import com.doumee.dao.business.join.LocksJoinMapper;
+import com.doumee.dao.business.model.BaseParam;
+import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;
+import com.doumee.dao.business.model.Sites;
import com.doumee.service.business.LocksService;
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.doumee.service.business.SitesService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -27,6 +32,9 @@
@Autowired
private LocksMapper locksMapper;
+
+ @Autowired
+ private LocksJoinMapper locksJoinMapper;
@Override
public String create(Locks locks) {
@@ -84,58 +92,30 @@
QueryWrapper<Locks> wrapper = new QueryWrapper<>(locks);
return locksMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Locks> findPage(PageWrap<Locks> pageWrap) {
IPage<Locks> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Locks> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Locks> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Locks::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Locks::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Locks::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Locks::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Locks::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Locks::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Locks::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Locks::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(Locks::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Locks::getName, pageWrap.getModel().getName());
- }
+
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Locks::getCode, pageWrap.getModel().getCode());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Locks::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.like(Locks::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getSiteId() != null) {
- queryWrapper.lambda().eq(Locks::getSiteId, pageWrap.getModel().getSiteId());
+ queryWrapper.like(Locks::getSiteId, pageWrap.getModel().getSiteId());
}
- if (pageWrap.getModel().getBikeCode() != null) {
- queryWrapper.lambda().eq(Locks::getBikeCode, pageWrap.getModel().getBikeCode());
+ if (pageWrap.getModel().getSiteName() != null) {
+ queryWrapper.like(Sites::getName, pageWrap.getModel().getSiteName());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(locksMapper.selectPage(page, queryWrapper));
+ queryWrapper.leftJoin(Bikes.class,Bikes::getCode,Locks::getBikeCode)
+ .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
+ .leftJoin(Sites.class,Sites::getCode,Locks::getSiteId);
+ queryWrapper.orderByDesc(Locks::getBikeCode);
+ queryWrapper.selectAll(Locks.class)
+ .selectAs(Sites::getName,Locks::getSiteName)
+ .selectAs(BaseParam::getName,Locks::getBikeType);
+ return PageData.from(locksJoinMapper.selectJoinPage(page, Locks.class,queryWrapper));
}
@Override
--
Gitblit v1.9.3