From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化

---
 server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java |   24 ++++++++++++++++++------
 1 files changed, 18 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..89a400b 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) {
 
@@ -107,6 +111,11 @@
         queryWrapper.orderByDesc(ActionLog::getCreateDate);
         queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,ActionLog::getUserId);
         queryWrapper.eq(ActionLog::getIsdeleted, Constants.ZERO);
+        queryWrapper.ge(pageWrap.getModel().getStartDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getStartDate());
+        queryWrapper.like(pageWrap.getModel().getTitle()!=null, ActionLog::getTitle,pageWrap.getModel().getTitle());
+        queryWrapper.like(pageWrap.getModel().getParam()!=null, ActionLog::getParam,pageWrap.getModel().getParam());
+        queryWrapper.like(pageWrap.getModel().getParam2()!=null, ActionLog::getParam2,pageWrap.getModel().getParam2());
+        queryWrapper.like(pageWrap.getModel().getParam3()!=null, ActionLog::getParam3,pageWrap.getModel().getParam3());
         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());
@@ -136,10 +145,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