|
@@ -551,9 +551,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
|
|
|
.eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId())
|
|
|
.eq(WbsTreePrivate::getType, 1)
|
|
|
);
|
|
|
-
|
|
|
-// wbsTreePrivates.stream().map(WbsTreePrivate::getId)
|
|
|
-
|
|
|
wbsTreePrivates.stream().forEach(wbsTreePrivate -> {
|
|
|
idList2.add(String.valueOf(wbsTreePrivate.getId()));
|
|
|
});
|
|
@@ -692,23 +689,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
|
|
|
WbsTreePrivate wbsTreePrivate2 = getWbsTreePrivate1(tree, pawDTO);
|
|
|
insertData.add(wbsTreePrivate2);
|
|
|
});
|
|
|
-
|
|
|
-
|
|
|
- /*List<List<WbsTree>> wbsTrees = new ArrayList<>();
|
|
|
- diffRent.stream().forEach(id -> {
|
|
|
- //查询所有公共节点+表单
|
|
|
- List<WbsTree> trees = baseMapper.selectNodeAndTable(Long.valueOf(id));
|
|
|
- wbsTrees.add(trees);
|
|
|
- number1[0]++;
|
|
|
- });*/
|
|
|
- /*wbsTrees.stream().forEach(trees -> {
|
|
|
- trees.stream().forEach(tree -> {
|
|
|
- WbsTreePrivate wbsTreePrivate2 = getWbsTreePrivate1(tree, pawDTO);
|
|
|
- insertData.add(wbsTreePrivate2);
|
|
|
- });
|
|
|
- });*/
|
|
|
-
|
|
|
-
|
|
|
} else if (pawDTO.getReferenceType().equals("private")) {
|
|
|
//私有
|
|
|
//查询所有私有节点+表单
|
|
@@ -721,22 +701,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
|
|
|
WbsTreePrivate wbsTreePrivate2 = getWbsTreePrivate2(wbsTreePrivate, pawDTO);
|
|
|
insertData2.add(wbsTreePrivate2);
|
|
|
});
|
|
|
-
|
|
|
-
|
|
|
- /*List<List<WbsTreePrivate>> wbsTreesPrivate = new ArrayList<>();
|
|
|
- diffRent.stream().forEach(id -> {
|
|
|
- //查询所有私有节点 表单
|
|
|
- List<WbsTreePrivate> wbsTreePrivate = wbsTreePrivateMapper.selectNodeAndTable(id, pawDTO.getWbsId(), pawDTO.getReferencePrivateWbsProjectId());
|
|
|
- wbsTreesPrivate.add(wbsTreePrivate);
|
|
|
- });
|
|
|
- wbsTreesPrivate.stream().forEach(wbsTreePrivates -> {
|
|
|
- wbsTreePrivates.stream().forEach(wbsTreePrivate -> {
|
|
|
- WbsTreePrivate wbsTreePrivate2 = getWbsTreePrivate2(wbsTreePrivate, pawDTO);
|
|
|
- insertData2.add(wbsTreePrivate2);
|
|
|
- });
|
|
|
- });*/
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
if (pawDTO.getReferenceType().equals("public")) {
|
|
|
wbsTreePrivateService.saveBatch(insertData, 10000);
|