From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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..1db0976 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
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import cn.binarywang.wx.miniapp.api.WxMaService;
import com.alibaba.fastjson.JSONObject;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
@@ -39,6 +40,9 @@
private ActionLogMapper actionLogMapper;
@Autowired
private ActionLogJoinMapper actionLogJoinMapper;
+
+
+
@Override
public String create(ActionLog actionLog) {
@@ -88,7 +92,7 @@
@Override
public ActionLog findOne(ActionLog actionLog) {
QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog);
- return actionLogMapper.selectOne(wrapper);
+ return actionLogMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -96,7 +100,7 @@
QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog);
return actionLogMapper.selectList(wrapper);
}
-
+
@Override
public PageData<ActionLog> findPage(PageWrap<ActionLog> pageWrap) {
@@ -106,7 +110,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 +120,40 @@
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.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent, pageWrap.getModel().getBikeCode() );
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),ActionLog::getBeforeContent, pageWrap.getModel().getOpenid() );
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName()),SystemUser::getRealname, pageWrap.getModel().getCreatorName());
+ queryWrapper.eq(ActionLog::getObjType,Constants.ActionLogObjType.memberrides);
+ queryWrapper
+ .selectAll(ActionLog.class)
+ .selectAs(SystemUser::getRealname,ActionLog::getCreatorName)
+ .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