From d0b97b5655a6cac1efbda08dad1d3019ed973923 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 21 五月 2025 12:04:16 +0800
Subject: [PATCH] 设备日志批量导出
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java
index 6b3546c..5f1d20d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java
@@ -24,19 +24,15 @@
List<MdcEquipmentDto> getMacingDataList(@Param("tableName") String tableName);
@InterceptorIgnore(tenantLine = "1")
- @Select("select Sequencenumber,CollectTime from [${tableName}] " +
- " where CollectTime > #{startTime} and CollectTime <= #{endTime} and Sequencenumber is not null" +
+ @Select("select Sequencenumber,CollectTime from ${tableName} " +
+ " where CollectTime > #{startTime} and CollectTime <= #{endTime} and Sequencenumber is not null and Sequencenumber != ''" +
" order by CollectTime desc ")
List<Map<String, Object>> getEquipmentSequenceNumber(@Param("tableName") String tableName, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
@InterceptorIgnore(tenantLine = "1")
- @Select("select CollectTime ${columns} from [${tableName}] where CollectTime > #{startTime} and CollectTime <= #{endTime} order by CollectTime asc")
+ @Select("select CollectTime ${columns} from ${tableName} where CollectTime > #{startTime} and CollectTime <= #{endTime} order by CollectTime asc")
List<Map<String, Object>> getWorkLineList(Map<String, Object> param);
-
- @InterceptorIgnore(tenantLine = "1")
- @Select("SELECT COUNT(*) FROM SysObjects WHERE XType='U' AND name = '${tableName}'")
- Integer isTableExist(@Param("tableName") String tableName);
@InterceptorIgnore(tenantLine = "1")
List<String> findRunningData(@Param("tableName") String saveTableName, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
@@ -49,4 +45,11 @@
@InterceptorIgnore(tenantLine = "1")
MdcEquipmentDto findProductCountEndTime(@Param("tableName") String saveTableName, @Param("productCount") String productCount, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+ @InterceptorIgnore(tenantLine = "1")
+ Map<String, Object> getDataList(@Param("tableName") String saveTableName);
+
+ @InterceptorIgnore(tenantLine = "1")
+ Map<String, Object> getDataProductName(@Param("tableName") String saveTableName);
+
}
--
Gitblit v1.9.3