From 2d727903343feb01fedc988370091395c368faf2 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期二, 17 十二月 2024 16:06:42 +0800 Subject: [PATCH] OEE功能及设备管理调整 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java | 8 ++------ 1 files changed, 2 insertions(+), 6 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..40de87a 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}] " + + @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); @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