From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商
---
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 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..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) {
@@ -136,10 +140,13 @@
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.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)
--
Gitblit v1.9.3