From fdd8b1d79a9c899a0ad6dde6c17bef0a8488e6b0 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 12 九月 2022 13:20:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs
---
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index 3357726..57e2713 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
import java.util.Set;
@Service("manLocDetlService")
@@ -18,7 +19,9 @@
@Override
public Page<ManLocDetl> getPage(Page<ManLocDetl> page) {
- page.setRecords(baseMapper.listByPage(page.getCondition()));
+ Map<String, Object> condition = page.getCondition();
+ List<ManLocDetl> manLocDetls = baseMapper.listByPage(condition);
+ page.setRecords(manLocDetls);
page.setTotal(baseMapper.listByPageCount(page.getCondition()));
return page;
}
@@ -119,4 +122,13 @@
return this.baseMapper.selectLocDetlSumQty(locNo);
}
+ @Override
+ public Page<ManLocDetl> getOutPage(Page<ManLocDetl> manLocDetlPage) {
+ Map<String, Object> condition = manLocDetlPage.getCondition();
+ List<ManLocDetl> manLocDetls = baseMapper.listByOutPage(condition);
+ manLocDetlPage.setRecords(manLocDetls);
+ manLocDetlPage.setTotal(baseMapper.listByOutPageCount(manLocDetlPage.getCondition()));
+ return manLocDetlPage;
+ }
+
}
--
Gitblit v1.9.1