From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/service/sys/OperateService.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lf/server/service/sys/OperateService.java b/src/main/java/com/lf/server/service/sys/OperateService.java
index 3a286fe..aa833b4 100644
--- a/src/main/java/com/lf/server/service/sys/OperateService.java
+++ b/src/main/java/com/lf/server/service/sys/OperateService.java
@@ -1,10 +1,12 @@
 package com.lf.server.service.sys;
 
 import com.lf.server.entity.sys.OperateEntity;
+import com.lf.server.helper.StringHelper;
 import com.lf.server.mapper.sys.OperateMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -18,13 +20,17 @@
     OperateMapper operateMapper;
 
     @Override
-    public Integer selectCount(String userid) {
-        return operateMapper.selectCount(userid);
+    public Integer selectCount(String uname, Integer type, Timestamp start, Timestamp end) {
+        uname = StringHelper.getLikeUpperStr(uname);
+
+        return operateMapper.selectCount(uname, type, start, end);
     }
 
     @Override
-    public List<OperateEntity> selectByPage(String userid, Integer limit, Integer offset) {
-        return operateMapper.selectByPage(userid,limit,offset);
+    public List<OperateEntity> selectByPage(String uname, Integer type, Timestamp start, Timestamp end, Integer limit, Integer offset) {
+        uname = StringHelper.getLikeUpperStr(uname);
+
+        return operateMapper.selectByPage(uname, type, start, end, limit, offset);
     }
 
     @Override
@@ -61,4 +67,9 @@
     public List<OperateEntity> selectOperateAll() {
         return operateMapper.selectOperateAll();
     }
+
+    @Override
+    public List<OperateEntity> operateCount() {
+        return operateMapper.operateCount();
+    }
 }

--
Gitblit v1.9.3