From 419e76f6256868851ed245940297f7f5bfd99e55 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 01 六月 2023 17:54:45 +0800
Subject: [PATCH] 化验页面优化1
---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index 9a35a08..b7eb6ed 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -787,7 +787,7 @@
}
@Override
- public String updateSampleData(InoutData data) {
+ public String updateSampleData(InoutCheckData data) {
if (StringUtils.isEmpty(data.getCompanyId())) {
data.setCompanyId(ContextUtil.getCompanyId());
}
@@ -799,4 +799,42 @@
return null;
}
+ @Override
+ public Page<InoutCheckData> pageCheckData(InoutCheckParam param) {
+
+ //璁剧疆璧峰鍜屾埅姝㈡椂闂�
+ if (null != param.getStart()) {
+ param.setStart(DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ param.setEnd(DateUtil.getNextZero(param.getEnd()));
+ }
+
+ // 璁剧疆妫�楠屽崟鎹殑妯＄硦鏌ヨ
+ if (StringUtils.isNotEmpty(param.getCheckId())) {
+ param.setCheckId("%" + param.getCheckId() + "%");
+ }
+
+ Page<InoutCheckData> page = new Page<>(param.getPage(), param.getLimit());
+ page.setSearchCount(true);
+
+ List<InoutCheckData> records = inoutCheckMapper.pageCheckData(page, param);
+ page.setRecords(records);
+
+ return page;
+ }
+
+ @Override
+ public String updateCheckData(InoutCheckData data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setCompanyId(ContextUtil.subDeptId(null));
+ }
+
+ int num = inoutCheckMapper.updateCheckData(data);
+ return null;
+ }
+
}
--
Gitblit v1.9.3