From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 0f32435..4825207 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: 璁惧琛�
@@ -48,12 +50,12 @@
/**
* 鏍规嵁閮ㄩ棬id鏌ヨ璁惧
*/
- List<MdcEquipment> queryByDepartId(@Param("departId") String departId);
+ List<MdcEquipment> queryByDepartId(@Param("departId") String departId, @Param("key") String key);
/**
* 鏍规嵁浜х嚎id鏌ヨ璁惧
*/
- List<MdcEquipment> queryByProductionId(@Param("productionId") String productionId);
+ List<MdcEquipment> queryByProductionId(@Param("productionId") String productionId, @Param("key") String key);
/**
* 鏌ユ壘璁惧鐩戞帶淇℃伅
@@ -97,5 +99,24 @@
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
+ *
+ * @param mdcEquipment
+ * @return
+ */
+ List<MdcEquipment> exportXlsList(@Param("mdcEquipment") MdcEquipmentVo mdcEquipment);
+
+ /**
+ * 鏌ヨ鍗曡〃鏁版嵁
+ *
+ * @param tableName
+ * @return
+ */
+ @InterceptorIgnore(tenantLine = "1")
+ MdcEquipmentDto findWorkLineLast(@Param("tableName") String tableName);
+
}
--
Gitblit v1.9.3