From 5c3742eca3b35c96f66c53b8dfabcb6848e03a7d Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 16:46:19 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 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..63e1fc0 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,34 @@
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(),
+ equipment.getLineId(),
+ equipment.getIsLineEquip(),
+ equipment.getIsLine(),
+ sql
+ ));
+ }
+
+ @Override
+ public IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId,String type) {
+ return page.setRecords(baseMapper.getStandardList(page,mainId,type));
+ }
}
--
Gitblit v1.9.3