From 1a11e4022a6b53a82bb45cda009ae653cdb55ab2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 24 十月 2023 10:59:03 +0800
Subject: [PATCH] # 财务管理 修改
---
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 b55f6d9..7bf4191 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
@@ -96,7 +96,7 @@
QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog);
return actionLogMapper.selectList(wrapper);
}
-
+
@Override
public PageData<ActionLog> findPage(PageWrap<ActionLog> pageWrap) {
@@ -136,10 +136,11 @@
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)
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent,"%"+pageWrap.getModel().getBikeCode()+"%");
+ 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)
--
Gitblit v1.9.3