From 801956f3b52d092e88d6c85b809383a1c1f71a05 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 10 十月 2023 08:59:51 +0800
Subject: [PATCH] #pgsql 基础配置 字段值跟新上传
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 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 e4c54a6..3c98943 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
@@ -11,6 +11,7 @@
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.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MemberRidesQuery;
import com.doumee.service.business.MemberRidesService;
@@ -145,5 +146,49 @@
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");
+
+ IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
+ if (!CollectionUtils.isEmpty(bikeLogDTOIPage.getRecords())){
+ bikeLogDTOIPage.getRecords().forEach(s->{
+ if (Objects.nonNull(s.getBackDate())){
+ s.setRideTime(DateUtil.betweenMin(s.getRentDate(),s.getBackDate()));
+ }
+ });
+ }
+ return PageData.from(bikeLogDTOIPage);
+ }
}
--
Gitblit v1.9.3