From 37fd5447c3b7bfdd3d1b31f8d68c6750471f178c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 27 八月 2025 16:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java | 14 +-------------
1 files changed, 1 insertions(+), 13 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..bd308a4 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
@@ -21,9 +21,6 @@
public interface EquipmentWorklineMapper {
@InterceptorIgnore(tenantLine = "1")
- 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" +
" order by CollectTime desc ")
@@ -35,20 +32,11 @@
List<Map<String, Object>> getWorkLineList(Map<String, Object> param);
@InterceptorIgnore(tenantLine = "1")
- @Select("SELECT COUNT(*) FROM SysObjects WHERE XType='U' AND name = '${tableName}'")
+ @Select("SELECT COUNT(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE () AND TABLE_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);
-
- @InterceptorIgnore(tenantLine = "1")
List<EquipmentMachingDto> getEquipProgramNum(@Param("tableName") String saveTableName, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
-
- @InterceptorIgnore(tenantLine = "1")
- MdcEquipmentDto findProductCountStartTime(@Param("tableName") String saveTableName, @Param("productCount") String productCount, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
-
- @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);
--
Gitblit v1.9.3