From d5d2e359c7aeedb265519a07b47ce25859cf9ee7 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期一, 23 十月 2023 10:35:36 +0800 Subject: [PATCH] #调整记录修改 --- server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 ed45c40..b07dca8 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 @@ -88,7 +88,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 +96,7 @@ QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog); return actionLogMapper.selectList(wrapper); } - + @Override public PageData<ActionLog> findPage(PageWrap<ActionLog> pageWrap) { @@ -136,10 +136,10 @@ 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 + .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