|
@@ -1719,7 +1719,12 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
|
|
List<WbsTreeContract> insertDataContractList = new ArrayList<>();
|
|
List<WbsTreeContract> insertDataContractList = new ArrayList<>();
|
|
|
|
|
|
// if (("1").equals(wbsTreePrivate.getWbsType())) {
|
|
// if (("1").equals(wbsTreePrivate.getWbsType())) {
|
|
- if (("public").equals(projectInfo.getReferenceWbsTemplateType())) {
|
|
|
|
|
|
+ if (
|
|
|
|
+ ("1".equals(wbsTreePrivate.getWbsType()) && ("public").equals(projectInfo.getReferenceWbsTemplateType())) ||
|
|
|
|
+ ("2".equals(wbsTreePrivate.getWbsType()) && ("public").equals(projectInfo.getReferenceWbsTemplateTypeTrial())) ||
|
|
|
|
+ ("3".equals(wbsTreePrivate.getWbsType()) && ("public").equals(projectInfo.getReferenceWbsTemplateTypeMeter())) ||
|
|
|
|
+ ("5".equals(wbsTreePrivate.getWbsType()) && ("public").equals(projectInfo.getReferenceWbsTemplateTypeLar()))
|
|
|
|
+ ) {
|
|
/*-------------------------------------质检公有引用同步--------------------------------------------*/
|
|
/*-------------------------------------质检公有引用同步--------------------------------------------*/
|
|
//获取当前节点对应的公有引用树下的元素表
|
|
//获取当前节点对应的公有引用树下的元素表
|
|
List<WbsTree> wbsTrees = wbsTreeMapper.selectList(Wrappers.<WbsTree>lambdaQuery()
|
|
List<WbsTree> wbsTrees = wbsTreeMapper.selectList(Wrappers.<WbsTree>lambdaQuery()
|
|
@@ -1803,7 +1808,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- } else if (("private").equals(projectInfo.getReferenceWbsTemplateType())) {
|
|
|
|
|
|
+ } else {
|
|
/*-------------------------------------质检私有引用同步--------------------------------------------*/
|
|
/*-------------------------------------质检私有引用同步--------------------------------------------*/
|
|
//根据wbsTreePrivate的wbsId=私有引用的pKeyId来获取引用树根节点
|
|
//根据wbsTreePrivate的wbsId=私有引用的pKeyId来获取引用树根节点
|
|
WbsTreePrivate wbsTreePrivateRoot = baseMapper.selectOne(Wrappers.<WbsTreePrivate>lambdaQuery()
|
|
WbsTreePrivate wbsTreePrivateRoot = baseMapper.selectOne(Wrappers.<WbsTreePrivate>lambdaQuery()
|