From bdd0875d4b13a3f1ef472f64d4b6a95e0ef64b22 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期六, 19 八月 2023 10:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/develop'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 b5233df..04bfbad 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
@@ -34,12 +34,17 @@
@Override
@Transactional(readOnly = true)
- public List<EquipmentMachingDto> getEquipmentSequencenumber(String drivetype, String equipmentid, Date startTime, Date endTime) {
- String tableName = drivetype + "_" + equipmentid;
+ public List<EquipmentMachingDto> getEquipmentSequencenumber(String tableName, Date startTime, Date endTime) {
List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
return convertData(list);
}
+ @Override
+ public Boolean isTableExist(String tableName) {
+ Integer count = equipmentWorkLineMapper.isTableExist(tableName);
+ return count != 0;
+ }
+
private List<EquipmentMachingDto> convertData(List<Map<String, Object>> list) {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
List<EquipmentMachingDto> dto = new ArrayList<>();
--
Gitblit v1.9.3