From e5161740b5be53690c672b727e74547ecbcab30c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 05 六月 2025 09:20:58 +0800
Subject: [PATCH] 修改原有的电子样板检索
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
index 0e11f39..0562ada 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
@@ -1041,7 +1041,6 @@
if (treeInfoRequest.getAttributionType() == 1 && StrUtil.isNotBlank(treeInfoRequest.getAttributionId())) {
queryWrapper.eq(ProductInfo::getProductId, treeInfoRequest.getAttributionId());
}
- // 绠�鍖栨潯浠跺垽鏂�
queryWrapper.like(StrUtil.isNotBlank(treeInfoRequest.getTreeCode()), ProductInfo::getProductNo, treeInfoRequest.getTreeCode())
.like(StrUtil.isNotBlank(treeInfoRequest.getTreeName()), ProductInfo::getProductName, treeInfoRequest.getTreeName());
List<ProductInfo> productInfoList = super.list(queryWrapper);
@@ -1050,15 +1049,12 @@
productInfoList=new ArrayList<>();
}
if (CollectionUtil.isNotEmpty(productInfoList)) {
- // 浣跨敤ID鍒楄〃鑰岄潪鎷兼帴瀛楃涓�
- List<String> productIds = productInfoList.stream()
- .map(ProductInfo::getProductId)
- .collect(Collectors.toList());
+ String ids=productInfoList.stream().map(ProductInfo::getProductId).collect(Collectors.joining(","));
DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
BeanUtil.copyProperties(treeInfoRequest, docQuery);
- docQuery.setAttributionIds(productIds.toString()); // 鍋囪setAttributionIds鎺ュ彈List<String>
+ docQuery.setAttributionIds(ids);
docQuery.setDocClassCode("OTHER");
- docQuery.setAttributionType(1);
+ docQuery.setAttributionType(DocAttributionTypeEnum.PRODUCT.getCode());
docInfos = docInfoService.findListByDocQuery(docQuery);
}
// 鍒涘缓鏂拌姹傚璞￠伩鍏嶆薄鏌撳師鍙傛暟
@@ -1069,6 +1065,8 @@
docInfos.addAll(componentInfoService.getByComponentInfo(componentRequest));
docInfos.addAll(partsInfoService.getByPartsInfo(componentRequest));
docInfos.addAll(processSpecVersionService.getByProcessSpecVersion(componentRequest));
+ docInfos.addAll(processStreamService.getByProcessStreamOtherFile(componentRequest));
+ docInfos.addAll(workStepService.getByWorkStepOtherFile(componentRequest));
return getByTreeOtherFileInfo(docInfos);
case 2:
return getByTreeOtherFileInfo(componentInfoService.getByComponentInfo(treeInfoRequest));
--
Gitblit v1.9.3