From c0d0d3b19d7c2181316582aceffa874d7fc4566d Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期日, 08 十月 2023 17:29:31 +0800 Subject: [PATCH] 不同类型设备设备台账 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java index 9c5660f..475fd2d 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java @@ -2,7 +2,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.eam.entity.Equipment; +import org.jeecg.modules.eam.entity.EquipmentCategory; +import org.jeecg.modules.eam.entity.MaintenanceStandardDetail; import org.jeecg.modules.eam.mapper.EamEquipmentMapper; import org.jeecg.modules.eam.model.DepartVo; import org.jeecg.modules.eam.service.IEamEquipmentService; @@ -92,4 +95,26 @@ IPage<Map> pageData = new Page<Map>(pageNo, pageSize); return super.getBaseMapper().pageEquipment(pageData,params); } + + @Override + public Page<Equipment> getEquipmentList(Page<Equipment> page, Equipment equipment) { + String sql = equipment.getEquipmentCategoryUda1(); + return page.setRecords(baseMapper.getEquipmentList( + page, + equipment.getNum(), + equipment.getName(), + equipment.getModel(), + equipment.getWorkCenterId(), + equipment.getFactoryModelId(), + equipment.getManageId(), + equipment.getUseId(), + equipment.getEquipmentImportanceId(), + equipment.getTechnologyStatus(), + equipment.getEquipmentStatus(), + equipment.getSpecificEquipment(), + equipment.getWarrantyStart(), + equipment.getWarrantyEnd(), + sql + )); + } } -- Gitblit v1.9.3