From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 26 五月 2025 16:12:55 +0800 Subject: [PATCH] 点检报表后端 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 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 0fa0195..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 @@ -1,11 +1,14 @@ package org.jeecg.modules.mdc.mapper; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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; import org.jeecg.modules.mdc.entity.MdcEquipment; import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor; import org.jeecg.modules.mdc.vo.MdcEquipmentDepVo; @@ -14,6 +17,7 @@ import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo; import java.util.List; +import java.util.Map; /** * @Description: 璁惧琛� @@ -46,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); /** * 鏌ユ壘璁惧鐩戞帶淇℃伅 @@ -93,4 +97,26 @@ * 鍒嗛〉鍒楄〃 */ IPage<MdcEquipment> pageList(Page<MdcEquipment> page, @Param("mdcEquipment") MdcEquipmentVo mdcEquipment); + + @InterceptorIgnore(tenantLine = "1") + @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