From 080edcadaec99063016531f1aa3e623b062d3c9b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 15:22:32 +0800
Subject: [PATCH] 骑行记录表优化和导出
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 94 ++++++++++++++++-------------------------------
1 files changed, 32 insertions(+), 62 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 4d28930..25de87e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -1,9 +1,6 @@
package com.doumee.service.business.impl;
import com.doumee.core.constants.Constants;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
@@ -14,9 +11,9 @@
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
-import com.doumee.dao.business.web.response.MemberRidesQuery;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.MemberRidesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -107,35 +104,15 @@
return memberRidesMapper.selectList(wrapper);
}
+ /**
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return
+ */
@Override
public PageData<MemberRidesDTO> findPage(PageWrap<MemberRidesQuery> pageWrap) {
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.orderByDesc(MemberRides::getCreateDate);
- queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
- .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
- .leftJoin(Goodsorder.class,Goodsorder::getId,MemberRides::getOrdreId)
- .eq(BaseParam::getType, Constants.THREE)
- .like(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),MemberRides::getBikeCode,pageWrap.getModel().getBikeCode())
- .between((Objects.nonNull(pageWrap.getModel().getRentDateStart())&&Objects.nonNull(pageWrap.getModel().getRentDateEnd())),
- MemberRides::getRentDate,
- pageWrap.getModel().getRentDateStart(),pageWrap.getModel().getRentDateEnd());
- if (Objects.nonNull(pageWrap.getModel().getStatus())
- && Constants.GOODSORDER_STATUS.CLOSE.getKey().equals(pageWrap.getModel().getStatus())){
- queryWrapper.eq(Goodsorder::getStatus,pageWrap.getModel().getStatus());
- }else if (Objects.nonNull(pageWrap.getModel().getStatus())
- && !Constants.GOODSORDER_STATUS.CLOSE.getKey().equals(pageWrap.getModel().getStatus())){
- queryWrapper.ne(Goodsorder::getStatus,pageWrap.getModel().getStatus());
- }
- queryWrapper.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
- .selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
- .selectAs(Goodsorder::getStatus,MemberRidesDTO::getStatus)
- .selectAs(BaseParam::getName,MemberRidesDTO::getBikeType)
- .selectAs(MemberRides::getDuration,MemberRidesDTO::getDuration)
- .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
- .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+ MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
IPage<MemberRidesDTO> memberRidesDTOIPage = memberRidesJoinMapper.selectJoinPage(page, MemberRidesDTO.class, queryWrapper);
if (!CollectionUtils.isEmpty(memberRidesDTOIPage.getRecords())){
memberRidesDTOIPage.getRecords().forEach(s->{
@@ -153,41 +130,11 @@
return memberRidesMapper.selectCount(wrapper);
}
+
@Override
public PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap) {
-
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.orderByDesc(MemberRides::getCreateDate);
- queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
- .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
- .eq(BaseParam::getType, Constants.THREE)
- .like(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),MemberRides::getBikeCode,pageWrap.getModel().getBikeCode())
- .between((Objects.nonNull(pageWrap.getModel().getRentDateStart())&&Objects.nonNull(pageWrap.getModel().getRentDateEnd())),
- MemberRides::getRentDate,
- pageWrap.getModel().getRentDateStart(),pageWrap.getModel().getRentDateEnd());
- if (Objects.nonNull(pageWrap.getModel().getHasBack())
- && pageWrap.getModel().getHasBack()){
- queryWrapper.isNotNull(MemberRides::getBackDate);
- }else if (Objects.nonNull(pageWrap.getModel().getStatus())
- && !pageWrap.getModel().getHasBack()){
- queryWrapper.isNull(MemberRides::getBackDate);
- }
- queryWrapper.orderByDesc(MemberRides::getCreateDate);
- queryWrapper.leftJoin("locks rl on rl.id = t.rent_lock_id and rl.site_id = t.rent_site_id")
- .leftJoin("sites rs on rs.id = rl.site_id")
- .leftJoin("locks bl on bl.id = t.rent_lock_id and bl.site_id = t.rent_site_id")
- .leftJoin("sites bs on bs.id = rl.site_id");
- queryWrapper.selectAs(Member::getOpenid,BikeLogDTO::getOpenid)
- .selectAs(MemberRides::getBikeCode,BikeLogDTO::getBikeCode)
- .selectAs(BaseParam::getName,BikeLogDTO::getBikeType)
- .selectAs(MemberRides::getRentDate,BikeLogDTO::getRentDate)
- .selectAs(MemberRides::getBackDate,BikeLogDTO::getBackDate)
- .select("rs.Name as rentSiteName, rl.name as rentLockName")
- .select("bs.Name as backSiteName, bl.name as backLockName");
-
+ MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
if (!CollectionUtils.isEmpty(bikeLogDTOIPage.getRecords())){
bikeLogDTOIPage.getRecords().forEach(s->{
@@ -199,6 +146,29 @@
return PageData.from(bikeLogDTOIPage);
}
+ private MPJLambdaWrapper<MemberRides> initQueryParamByModel(MemberRidesQuery model) {
+ MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(model);
+ queryWrapper.orderByDesc(MemberRides::getCreateDate);
+ queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
+ .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+ .eq(BaseParam::getType, Constants.THREE)
+ .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
+ .like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
+ queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
+ queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
+ queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
+ queryWrapper.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
+ .selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
+ .selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
+ .selectAs(MemberRides::getStatus,MemberRidesDTO::getStatus)
+ .selectAs(BaseParam::getName,MemberRidesDTO::getBikeType)
+ .selectAs(MemberRides::getDuration,MemberRidesDTO::getDuration)
+ .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
+ .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+ return queryWrapper;
+ }
+
@Override
public String getOnlineBike(String memberId){
MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
--
Gitblit v1.9.3