From 00a6c486eb0f4aec35af265ff9851bff41f18bd2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:43:26 +0800
Subject: [PATCH] 修改报工前端判断流程卡位数
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java | 20 ++++++++++++++++----
1 files changed, 16 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..043ce1e 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,11 +47,22 @@
@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);
Boolean updateToExamine(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,
@Param("userName") String userName,
@Param("type") String type);
+
+ Boolean updateFinishedOperateLogState(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,@Param("type") String type);
+
+
+ List<OrderDetail> getSelectStorageRecord(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
+ @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+ Map<String,Integer> getSelectStorageRecordLogPageTotal(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
+ @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
}
--
Gitblit v1.8.0