From ded87427ffd9d8d74ad7cdae5c838b2f07e08f56 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 五月 2024 11:36:02 +0800
Subject: [PATCH] 报表筛选多选
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
index da4d309..09ecb8d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
@@ -46,7 +46,7 @@
}
@Override
- public List<Map<String, Object>> findRunningData(String tableName, Date startTime, Date endTime) {
+ public List<String> findRunningData(String tableName, Date startTime, Date endTime) {
return equipmentWorkLineMapper.findRunningData(tableName, startTime, endTime);
}
@@ -56,10 +56,18 @@
}
@Override
- public MdcEquipmentDto findProductCountStartTime(String saveTableName, String productCount) {
+ public MdcEquipmentDto findProductCountStartTime(String saveTableName, String productCount, Date startTime, Date endTime) {
try {
- List<MdcEquipmentDto> macingDataList = equipmentWorkLineMapper.findProductCountStartTime(saveTableName, productCount);
- return !macingDataList.isEmpty() ? macingDataList.get(0) : null;
+ return equipmentWorkLineMapper.findProductCountStartTime(saveTableName, productCount, startTime, endTime);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ @Override
+ public MdcEquipmentDto findProductCountEndTime(String saveTableName, String productCount, Date startTime, Date endTime) {
+ try {
+ return equipmentWorkLineMapper.findProductCountEndTime(saveTableName, productCount, startTime, endTime);
} catch (Exception e) {
return null;
}
--
Gitblit v1.9.3