From 41631eec06251ec8f858765af6a0858b180e720d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 22 二月 2024 08:22:56 +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 | 8 ++++----
1 files changed, 4 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 d78b990..f376ea2 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
@@ -21,11 +21,11 @@
Boolean insertFinishedOperateLogAllocate(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
List<OrderDetail> getselectAllocateFinishedOperateLog(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
Integer getselectAllocateFinishedOperateLogPageTotal(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
Integer getmaximum(@Param("type") String type);
@@ -43,11 +43,11 @@
@Param("remarks") String remarks);
List<OrderDetail> getSelectOperateRecord(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
Integer getSelectOperateRecordLogPageTotal(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
Boolean updateToExamine(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,
--
Gitblit v1.8.0