From e8ba2a1bec7ffbd78cb941521b31d000890e66de Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 二月 2024 14:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
index f376ea2..998cabb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
@@ -9,6 +9,7 @@
import org.springframework.data.repository.CrudRepository;
import java.util.List;
+import java.util.Map;
@Mapper
public interface FinishedOperateLogMapper extends CrudRepository<FinishedOperateLog,Long> {
@@ -24,9 +25,9 @@
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
- Integer getselectAllocateFinishedOperateLogPageTotal(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,String startDate, String endDate,
- @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+ Map<String,Integer> getselectAllocateFinishedOperateLogPageTotal(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize, String startDate, String endDate,
+ @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
Integer getmaximum(@Param("type") String type);
@@ -46,7 +47,7 @@
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
- Integer getSelectOperateRecordLogPageTotal(@Param("offset") Integer offset,
+ Map<String,Integer> getSelectOperateRecordLogPageTotal(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
--
Gitblit v1.8.0