From f6bcf1ba29b88c32b23def2bd6f3cee08905ce07 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 21:17:46 +0800
Subject: [PATCH] 修改设备查询
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 42 ++++++++++++++++--------------------------
1 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 65995b2..d6c9e23 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -129,7 +129,7 @@
if(!CollectionUtils.isEmpty(baseFactoryUserList)){
List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
- queryWrapper.in("e.factory_code", factoryCode);
+ queryWrapper.in("e.factory_org_code", factoryCode);
}
}
if(eamMaintenanceStandard != null) {
@@ -560,6 +560,10 @@
EamMaintenanceStandard eamMaintenanceStandard = extractDeviceInfo(sheet);
if (eamMaintenanceStandard == null) {
return Result.error("璁惧淇℃伅鎻愬彇澶辫触");
+ }else {
+ if (eamMaintenanceStandard.getEquipmentId() == null) {
+ return Result.error("璁惧淇℃伅鎻愬彇澶辫触");
+ }
}
eamMaintenanceStandard.setStandardName(name);
@@ -646,6 +650,7 @@
EamMaintenanceStandard standard = new EamMaintenanceStandard();
standard.setEquipmentName(extractField(headerText, "璁惧鍚嶇О[:锛歖\\s*(\\S+)"));
+ standard.setEquipmentCode(extractField(headerText, "缁熶竴缂栧彿[:锛歖\\s*(\\S+)"));
// 鏃ユ湡澶勭悊
@@ -662,22 +667,14 @@
}
// 鍏宠仈璁惧ID
- if (isNotBlank(standard.getEquipmentCode()) &&
- isNotBlank(standard.getEquipmentName())) {
-
- List<EamEquipment> equipments = eamEquipmentService.list(
- new QueryWrapper<EamEquipment>()
- .eq("equipment_code", standard.getEquipmentCode())
- .eq("equipment_name", standard.getEquipmentName())
- );
-
- if (!equipments.isEmpty()) {
- standard.setEquipmentId(equipments.get(0).getId());
- }else {
+ if (StrUtil.isNotEmpty(standard.getEquipmentCode())) {
+ EamEquipment equipments = eamEquipmentService.selectByEquipmentCode(standard.getEquipmentCode());
+ if (equipments == null) {
return null;
+ }else {
+ standard.setEquipmentId(equipments.getId());
}
}
-
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MAINTENANCE_STANDARD_CODE_RULE);
standard.setStandardCode(codeSeq);
standard.setMaintenanceCategory("POINT_INSPECTION");
@@ -1061,19 +1058,12 @@
standard.setEquipmentModel(row2Data.get("璁惧鍨嬪彿"));
// 鍏宠仈璁惧ID
- if (isNotBlank(standard.getEquipmentCode()) &&
- isNotBlank(standard.getEquipmentName())) {
-
- List<EamEquipment> equipments = eamEquipmentService.list(
- new QueryWrapper<EamEquipment>()
- .eq("equipment_code", standard.getEquipmentCode())
- .eq("equipment_name", standard.getEquipmentName())
- );
-
- if (!equipments.isEmpty()) {
- standard.setEquipmentId(equipments.get(0).getId());
- }else {
+ if (StrUtil.isNotEmpty(standard.getEquipmentCode())) {
+ EamEquipment equipments = eamEquipmentService.selectByEquipmentCode(standard.getEquipmentCode());
+ if (equipments == null) {
return null;
+ }else {
+ standard.setEquipmentId(equipments.getId());
}
}
--
Gitblit v1.9.3