From 0d0c698839c739f6ed001835a521b899c7ff0cec Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 15 五月 2025 16:34:29 +0800
Subject: [PATCH] 设备属性字典翻译
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java | 10 +++-------
1 files changed, 3 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 1c766c3..49eef7a 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);
--
Gitblit v1.9.3