From e90a991b74e9b6c5169b49a1dca2478b0bca2f25 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 23 六月 2025 14:27:58 +0800
Subject: [PATCH] 涉密网解析工控操作
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
index 511a5c5..a39eb0e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
@@ -53,6 +53,8 @@
@Autowired
private IProcessStreamService processStreamService;
@Autowired
+ private IWorkStepService workStepService;
+ @Autowired
private IProductMixService productMixService;
@Autowired
private IDocRelativeService iDocRelativeService;
@@ -187,8 +189,8 @@
boolean b = super.updateById(componentInfo);
//鍚屾淇敼缁撴瀯鏍�
ProductMix productMix = productMixService.getById(Long.parseLong(id));
- productMix.setName(componentInfo.getComponentName());
- productMix.setCode(componentInfo.getComponentCode());
+ productMix.setTreeName(componentInfo.getComponentName());
+ productMix.setTreeCode(componentInfo.getComponentCode());
productMixService.updateById(productMix);
if(!b)
return false;
@@ -589,10 +591,18 @@
List<String> id =new ArrayList<>();
id.add(treeInfoRequest.getAttributionId());
treeInfoRequest.setComponentIds(id);
+ //闆朵欢
List<DocInfo> partsInfos = partsInfoService.getByPartsInfo(treeInfoRequest);
docInfos.addAll(partsInfos);
+ //宸ヨ壓瑙勭▼鐗堟湰
List<DocInfo> processSpecVersions = processSpecVersionService.getByProcessSpecVersion(treeInfoRequest);
docInfos.addAll(processSpecVersions);
+ //宸ュ簭
+ List<DocInfo> processStreams = processStreamService.getByProcessStreamOtherFile(treeInfoRequest);
+ docInfos.addAll(processStreams);
+ //宸ユ
+ List<DocInfo> workSteps = workStepService.getByWorkStepOtherFile(treeInfoRequest);
+ docInfos.addAll(workSteps);
}
return docInfos;
}
@@ -618,14 +628,18 @@
List<Long> ids = productMixList.stream().map(ProductMix::getId).collect(Collectors.toList());
//鑾峰彇宸茬粡鑷韩琚�熺敤鐨勯儴浠�
LambdaQueryWrapper<ComponentInfo> borrowQueryWrapper = new LambdaQueryWrapper<>();
- borrowQueryWrapper.in(ComponentInfo::getBorrowId,ids);
+ if (!ids.isEmpty()){
+ borrowQueryWrapper.in(ComponentInfo::getBorrowId,ids);
+ }
borrowQueryWrapper.eq(ComponentInfo::getParentId,componentInfo.getComponentId());
List<String> borrowIds= super.list(borrowQueryWrapper).stream().map(ComponentInfo::getBorrowId).collect(Collectors.toList());
LambdaQueryWrapper<ComponentInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StrUtil.isNotEmpty(componentInfo.getComponentName()),ComponentInfo::getComponentName, componentInfo.getComponentName());
queryWrapper.like(StrUtil.isNotEmpty(componentInfo.getComponentCode()),ComponentInfo::getComponentCode, componentInfo.getComponentCode());
queryWrapper.isNull(ComponentInfo::getBorrowId);
- queryWrapper.in(ComponentInfo::getComponentId,ids);
+ if (!ids.isEmpty()){
+ queryWrapper.in(ComponentInfo::getComponentId,ids);
+ }
queryWrapper.ne(StrUtil.isNotEmpty(oldComponentInfo.getBorrowId()),ComponentInfo::getComponentId,oldComponentInfo.getBorrowId());
if (!borrowIds.isEmpty()) {
queryWrapper.notIn(ComponentInfo::getComponentId,borrowIds);
--
Gitblit v1.9.3