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 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 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..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
@@ -1,8 +1,13 @@
package org.jeecg.modules.eam.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
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;
@@ -10,8 +15,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @Description: mom_eam_equipment
@@ -92,4 +100,47 @@
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();
+ List<String> equipNums = new ArrayList<>();
+ if(StringUtils.isNotBlank(equipment.getNums())){
+ equipNums = Arrays.asList(equipment.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
+ }
+ return page.setRecords(baseMapper.getEquipmentList(
+ page,
+ equipment.getNum(),
+ equipment.getName(),
+ equipment.getModel(),
+ equipment.getWorkCenterId(),
+ equipment.getFactoryModelId(),
+ equipment.getAreaId(),
+ equipment.getManageId(),
+ equipment.getUseId(),
+ equipment.getEquipmentImportanceId(),
+ equipment.getTechnologyStatus(),
+ equipment.getEquipmentStatus(),
+ equipment.getSpecificEquipment(),
+ equipment.getWarrantyStart(),
+ equipment.getWarrantyEnd(),
+ equipment.getLineId(),
+ equipment.getIsLineEquip(),
+ equipment.getIsLine(),
+ equipment.getEquipmentCategoryId(),
+ equipNums,
+ sql
+ ));
+ }
+
+ @Override
+ 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