From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 20d8e9a..4e2248e 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
@@ -23,7 +23,7 @@
List<MdcEquipmentDto> getMacingDataList(@Param("tableName") String tableName);
@InterceptorIgnore(tenantLine = "1")
- @Select("select Sequencenumber,CollectTime from ${tableName} " +
+ @Select("select Sequencenumber,CollectTime from [${tableName}] " +
" where CollectTime > #{startTime} and CollectTime <= #{endTime} and Sequencenumber is not null" +
" order by CollectTime desc ")
List<Map<String, Object>> getEquipmentSequenceNumber(@Param("tableName") String tableName, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
@@ -32,4 +32,8 @@
@InterceptorIgnore(tenantLine = "1")
@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);
}
--
Gitblit v1.9.3