From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
index 12f4455..80991e7 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.mdc.dto.MdcEquDepDto;
import org.jeecg.modules.mdc.dto.MdcEquProDto;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
@@ -16,6 +17,7 @@
import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
import java.util.List;
+import java.util.Map;
/**
* @Description: 璁惧琛�
@@ -97,7 +99,8 @@
IPage<MdcEquipment> pageList(Page<MdcEquipment> page, @Param("mdcEquipment") MdcEquipmentVo mdcEquipment);
@InterceptorIgnore(tenantLine = "1")
- MdcEquipmentDto getWorkLineLast(@Param("tableName") String saveTableName);
+ @Select("select TOP 1 CollectTime ${columns} from [${tableName}] order by CollectTime desc")
+ Map<String, Object> getWorkLineLast(Map<String, Object> param);
/**
* 瀵煎嚭list
@@ -105,4 +108,13 @@
* @return
*/
List<MdcEquipment> exportXlsList(@Param("mdcEquipment") MdcEquipmentVo mdcEquipment);
+
+ /**
+ * 鏌ヨ鍗曡〃鏁版嵁
+ * @param tableName
+ * @return
+ */
+ @InterceptorIgnore(tenantLine = "1")
+ MdcEquipmentDto findWorkLineLast(@Param("tableName") String tableName);
+
}
--
Gitblit v1.9.3