|
@@ -708,7 +708,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
|
|
|
List<WbsTree> wbsTreeList = wbsTreeMapper.selectList(Wrappers.<WbsTree>query().lambda()
|
|
|
.eq(WbsTree::getWbsId, pawDTO.getWbsId())
|
|
|
.eq(WbsTree::getStatus, 1)
|
|
|
- //.eq(WbsTree::getType, 2)
|
|
|
);
|
|
|
wbsTreeListAll.addAll(wbsTreeList);
|
|
|
}
|
|
@@ -717,8 +716,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
|
|
|
List<WbsTree> wbsTreeListTables = wbsTreeListAll.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
|
|
|
|
|
|
//所有节点信息
|
|
|
- List<WbsTree> wbsTreeListNodes = wbsTreeListAll.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
|
|
|
-
|
|
|
+ //List<WbsTree> wbsTreeListNodes = wbsTreeListAll.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
|
|
|
|
|
|
//公有元素表的id
|
|
|
List<Long> collect1 = wbsTreeListTables.stream().map(WbsTree::getId).collect(Collectors.toList());
|
|
@@ -737,8 +735,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
|
|
|
|
|
|
List<String> diffRent1 = WbsTreeContractServiceImpl.getDiffrent(collect2, collect4);
|
|
|
|
|
|
- //同步公有wbs节点信息,编辑修改后的节点信息到项目级wbs、合同段wbs
|
|
|
- wbsTreePrivateService.updateBatchByIds(wbsTreeListNodes, pawDTO.getProjectId());
|
|
|
+ //同步公有wbs节点信息、元素表基础信息到项目级wbs、合同段wbs
|
|
|
+ wbsTreePrivateService.updateBatchByIds(wbsTreeListAll,pawDTO.getProjectId());
|
|
|
|
|
|
if (diffRent1.size() == 0) {
|
|
|
//当wbsTreeIds == "" 时 1.在第一次新增未选择wbs树时 2.同步新增的元素表时
|
|
@@ -830,14 +828,13 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
|
|
|
.eq(WbsTreePrivate::getWbsId, wbsTreePrivate.getWbsId())
|
|
|
.eq(WbsTreePrivate::getProjectId, wbsTreePrivate.getProjectId())
|
|
|
.eq(WbsTreePrivate::getStatus, 1)
|
|
|
- //.eq(WbsTreePrivate::getType, 2)
|
|
|
);
|
|
|
|
|
|
//私有引用项目的表单信息
|
|
|
List<WbsTreePrivate> WbsTreePrivateTables = wbsTreePrivates.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
|
|
|
|
|
|
//私有引用项目的节点信息
|
|
|
- List<WbsTreePrivate> WbsTreePrivateNodes = wbsTreePrivates.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
|
|
|
+ //List<WbsTreePrivate> WbsTreePrivateNodes = wbsTreePrivates.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
|
|
|
|
|
|
//当前新增表单的id
|
|
|
List<Long> collect1 = WbsTreePrivateTables.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
|
|
@@ -856,8 +853,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
|
|
|
|
|
|
List<String> diffRent1 = WbsTreeContractServiceImpl.getDiffrent(collect2, collect4);
|
|
|
|
|
|
- //同步私有wbs节点信息,编辑修改后的节点信息到项目级wbs、合同段wbs
|
|
|
- wbsTreePrivateService.updateBatchByIds2(WbsTreePrivateNodes, pawDTO.getProjectId(), pawDTO.getPrimaryKeyId());
|
|
|
+ //同步私有wbs节点信息、元素表基础信息到项目级wbs、合同段wbs
|
|
|
+ wbsTreePrivateService.updateBatchByIds2(wbsTreePrivates, pawDTO.getProjectId(), pawDTO.getPrimaryKeyId());
|
|
|
|
|
|
if (diffRent1.size() == 0) {
|
|
|
return true;
|