From d828d03c0b23d163c042e88cb21b8b15b1e6dedd Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 06 八月 2024 10:33:36 +0800
Subject: [PATCH] 数采bug修复
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 1097201..e7e22a0 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -105,17 +105,25 @@
@Override
public List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
- Integer id;
+ List<Integer> id;
try {
if (ObjectUtils.isEmpty(inspectionItemSubclass)) {
- id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// .eq(StructureItemParameter::getInspectionItem, inspectionItem)
+// .last("limit 1").select(StructureItemParameter::getId)).getId();
+ id = structureItemParameterMapper.selectList(Wrappers.<StructureItemParameter>lambdaQuery()
.eq(StructureItemParameter::getInspectionItem, inspectionItem)
- .last("limit 1").select(StructureItemParameter::getId)).getId();
+ .select(StructureItemParameter::getId)).stream().map(StructureItemParameter::getId).collect(Collectors.toList());
+
}else {
- id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// .eq(StructureItemParameter::getInspectionItem, inspectionItem)
+// .eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass)
+// .last("limit 1").select(StructureItemParameter::getId)).getId();
+ id = structureItemParameterMapper.selectList(Wrappers.<StructureItemParameter>lambdaQuery()
.eq(StructureItemParameter::getInspectionItem, inspectionItem)
.eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass)
- .last("limit 1").select(StructureItemParameter::getId)).getId();
+ .select(StructureItemParameter::getId)).stream().map(StructureItemParameter::getId).collect(Collectors.toList());
}
} catch (Exception e) {
return null;
@@ -127,9 +135,11 @@
for (Device device : devices) {
String[] ids = device.getInsProductIds().split(",");
for (String i : ids) {
- if (i.equals(id + "")) {
- devices2.add(device);
- break;
+ if (ObjectUtils.isNotEmpty(i)) {
+ if (id.contains(Integer.parseInt(i))) {
+ devices2.add(device);
+ break;
+ }
}
}
}
--
Gitblit v1.9.3