From 189c22920f56eccf89090197e82de8dae57c4a01 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 12 九月 2025 17:32:08 +0800
Subject: [PATCH] 根据车间筛选设备调整
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 0f483c0..43ad84a 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -161,13 +161,13 @@
if (StringUtils.isNotBlank(eamEquipment.getPerformanceIndicators())) {
queryWrapper.like("e.performance_indicators", eamEquipment.getPerformanceIndicators());
}
- if(oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryEndTime())){
- queryWrapper.ge("e.leave_factory_date",eamEquipment.getLeaveFactoryStartTime());
- queryWrapper.le("e.leave_factory_date",eamEquipment.getLeaveFactoryEndTime());
+ if (oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryEndTime())) {
+ queryWrapper.ge("e.leave_factory_date", eamEquipment.getLeaveFactoryStartTime());
+ queryWrapper.le("e.leave_factory_date", eamEquipment.getLeaveFactoryEndTime());
}
- if(oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckEndTime())){
- queryWrapper.ge("e.acceptance_check_date",eamEquipment.getAcceptanceCheckStartTime());
- queryWrapper.le("e.acceptance_check_date",eamEquipment.getAcceptanceCheckEndTime());
+ if (oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckEndTime())) {
+ queryWrapper.ge("e.acceptance_check_date", eamEquipment.getAcceptanceCheckStartTime());
+ queryWrapper.le("e.acceptance_check_date", eamEquipment.getAcceptanceCheckEndTime());
}
if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
//杞﹂棿缂栫爜涓嶄负绌�
@@ -304,12 +304,12 @@
statistics.setHighPrecisionOriginalValue(CollectionUtils.isNotEmpty(equipmentCategoryList) ? equipmentCategoryList.stream().map(eamEquipment -> eamEquipment.getOriginalValue() != null ? eamEquipment.getOriginalValue() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add) : BigDecimal.ZERO);
//璁剧疆鍥戒骇淇℃伅
- List<EamEquipment> equipmentDomesticList = eamEquipmentList.stream().filter(eamEquipment -> "china".equals(eamEquipment.getOriginCountry())).collect(Collectors.toList());
+ List<EamEquipment> equipmentDomesticList = eamEquipmentList.stream().filter(eamEquipment -> "涓浗".equals(eamEquipment.getOriginCountry())).collect(Collectors.toList());
statistics.setDomesticCount(CollectionUtils.isNotEmpty(equipmentDomesticList) ? equipmentDomesticList.size() : 0);
statistics.setDomesticOriginalValue(CollectionUtils.isNotEmpty(equipmentDomesticList) ? equipmentDomesticList.stream().map(eamEquipment -> eamEquipment.getOriginalValue() != null ? eamEquipment.getOriginalValue() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add) : BigDecimal.ZERO);
//璁剧疆杩涘彛淇℃伅
- List<EamEquipment> equipmentImportList = eamEquipmentList.stream().filter(eamEquipment -> !"china".equals(eamEquipment.getOriginCountry())).collect(Collectors.toList());
+ List<EamEquipment> equipmentImportList = eamEquipmentList.stream().filter(eamEquipment -> !"涓浗".equals(eamEquipment.getOriginCountry())).collect(Collectors.toList());
statistics.setImportCount(CollectionUtils.isNotEmpty(equipmentImportList) ? equipmentImportList.size() : 0);
statistics.setImportOriginalValue(CollectionUtils.isNotEmpty(equipmentImportList) ? equipmentImportList.stream().map(eamEquipment -> eamEquipment.getOriginalValue() != null ? eamEquipment.getOriginalValue() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add) : BigDecimal.ZERO);
@@ -385,4 +385,17 @@
}
}
+ @Override
+ public List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> orgIdList) {
+ List<EquipmentSearchResult> resultList = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(orgIdList)) {
+ List<EamEquipment> eamEquipmentList = eamEquipmentMapper.selectList(new LambdaQueryWrapper<EamEquipment>().in(EamEquipment::getOrgId, orgIdList));
+ if (CollectionUtils.isNotEmpty(eamEquipmentList)) {
+ for (EamEquipment eamEquipment : eamEquipmentList) {
+ resultList.add(new EquipmentSearchResult(eamEquipment));
+ }
+ }
+ }
+ return resultList;
+ }
}
--
Gitblit v1.9.3