From d40c3ccad0e5264fefd33264254564dead8c80df Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 06 十一月 2023 11:44:36 +0800 Subject: [PATCH] 单据名称增加单据来源 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 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..72ed6fa 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,11 @@ 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.DailyInspectionStandardDetail; 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 +96,31 @@ 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 + )); + } + + @Override + public IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId) { + return page.setRecords(baseMapper.getStandardList(page,mainId)); + } } -- Gitblit v1.9.3