From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 8 ++++++++
1 files changed, 8 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 1cf7c67..713e1ae 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
@@ -115,6 +115,7 @@
equipment.getModel(),
equipment.getWorkCenterId(),
equipment.getFactoryModelId(),
+ equipment.getAreaId(),
equipment.getManageId(),
equipment.getUseId(),
equipment.getEquipmentImportanceId(),
@@ -126,6 +127,7 @@
equipment.getLineId(),
equipment.getIsLineEquip(),
equipment.getIsLine(),
+ equipment.getEquipmentCategoryId(),
equipNums,
sql
));
@@ -135,4 +137,10 @@
public IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId,String type) {
return page.setRecords(baseMapper.getStandardList(page,mainId,type));
}
+
+ @Override
+ public IPage<Map<String, Object>> getEquipmentListAllStandard(Integer pageNo, Integer pageSize, Map<String, Object> params) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return super.getBaseMapper().getEquipmentListAllStandard(pageData,params);
+ }
}
--
Gitblit v1.9.3