From 90d576d41167dc383b499027c8f5624c7a5c63e0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 17:06:51 +0800
Subject: [PATCH] 骑行时长减免和强制还车
---
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
index 5515eca..ed45c40 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
@@ -106,7 +106,6 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.orderByDesc(ActionLog::getCreateDate);
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,ActionLog::getUserId);
- queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId);
queryWrapper.eq(ActionLog::getIsdeleted, Constants.ZERO);
queryWrapper.ge(pageWrap.getModel().getStartDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getStartDate());
queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate());
@@ -117,6 +116,37 @@
IPage<ActionLog> result = actionLogJoinMapper.selectJoinPage(page, ActionLog.class, queryWrapper);
+
+
+ return PageData.from(result);
+ }
+ @Override
+ public PageData<ActionLog> findRidePae(PageWrap<ActionLog> pageWrap){
+
+ IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+
+ MPJLambdaWrapper<ActionLog> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.orderByDesc(ActionLog::getCreateDate);
+ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,ActionLog::getUserId);
+ queryWrapper.leftJoin(MemberRides.class,MemberRides::getMemberId,ActionLog::getObjId);
+ queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId);
+ queryWrapper.eq(ActionLog::getIsdeleted, Constants.ZERO);
+ queryWrapper.ge(pageWrap.getModel().getStartDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getStartDate());
+ queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate());
+ queryWrapper.eq(pageWrap.getModel().getCreator()!=null, ActionLog::getCreator,pageWrap.getModel().getCreator());
+ queryWrapper.in(pageWrap.getModel().getTypeList()!=null && pageWrap.getModel().getTypeList().size()>0, ActionLog::getType,pageWrap.getModel().getTypeList());
+ queryWrapper.selectAs(ActionLog::getCreateDate,ActionLog::getCreateDate)
+ .selectAs(ActionLog::getActInfo,ActionLog::getActInfo)
+ .selectAs(ActionLog::getActReason,ActionLog::getActReason)
+ .selectAs(SystemUser::getNickname,ActionLog::getCreator)
+ .selectAs(Member::getOpenid,ActionLog::getOpenid)
+ .selectAs(MemberRides::getBikeCode,ActionLog::getBikeCode)
+ .selectAs(MemberRides::getRentSiteId,ActionLog::getRentSiteId)
+ .selectAs(MemberRides::getRentDate,ActionLog::getRentDate);
+
+ IPage<ActionLog> result = actionLogJoinMapper.selectJoinPage(page, ActionLog.class, queryWrapper);
+
if(result !=null && result.getRecords()!=null){
for (int i = 0; i < result.getRecords().size(); i++) {
ActionLog log = result.getRecords().get(i);
--
Gitblit v1.9.3