|
@@ -1023,7 +1023,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
|
|
* @param level
|
|
* @param level
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public Long getWbsKeyIdFromLayer(Long keyId,Long level){
|
|
|
|
|
|
+ public Long getWbsKeyIdFromLayer(Long keyId,Integer level){
|
|
return wbsTreeContractClient.getNextPkeyIdByNodeType(keyId,level);
|
|
return wbsTreeContractClient.getNextPkeyIdByNodeType(keyId,level);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1060,13 +1060,13 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
|
|
for (ArchiveTreeContract associatedNode:associatedNodes) {
|
|
for (ArchiveTreeContract associatedNode:associatedNodes) {
|
|
Long attachId = associatedNode.getId();
|
|
Long attachId = associatedNode.getId();
|
|
|
|
|
|
- Long level = null;
|
|
|
|
|
|
+ Integer level = null;
|
|
if (associatedNode.getDisplayHierarchy()!= null) {
|
|
if (associatedNode.getDisplayHierarchy()!= null) {
|
|
- level = Long.parseLong(associatedNode.getDisplayHierarchy());
|
|
|
|
|
|
+ level = Integer.valueOf(associatedNode.getDisplayHierarchy());
|
|
}
|
|
}
|
|
|
|
|
|
Long levelkeyId = getWbsKeyIdFromLayer(keyId,level);
|
|
Long levelkeyId = getWbsKeyIdFromLayer(keyId,level);
|
|
- ArchiveTreeContract node = getWbsNodeFromWbsKeyId(contractId,keyId,attachId);
|
|
|
|
|
|
+ ArchiveTreeContract node = getWbsNodeFromWbsKeyId(contractId,levelkeyId,attachId);
|
|
if (node!= null ) {
|
|
if (node!= null ) {
|
|
|
|
|
|
archiveFileClient.addOrUpdateArchiveFileBusinessData(node.getId(),keyId,contractId,formDataId);
|
|
archiveFileClient.addOrUpdateArchiveFileBusinessData(node.getId(),keyId,contractId,formDataId);
|