Merge branch '070501zhifk'

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/WbsTreeContractClient.java

@@ -175,6 +175,6 @@ public interface WbsTreeContractClient {
     void updateTabFileTypeByPkeyIds(@RequestParam List<Long> updatePKeyIds);
 
     @GetMapping(API_PREFIX + "/getNextPkeyIdByNodeType")
-    Long getNextPkeyIdByNodeType(@RequestParam Long pkeyId, @RequestParam Long nodeType);
+    Long getNextPkeyIdByNodeType(@RequestParam Long pkeyId, @RequestParam Integer nodeType);
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -1017,6 +1017,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         //TODO 文件题名规则，待补充
         fillFileNameAndTime(archiveFile,query);
 
+        archiveFile.setProjectId(query.getProjectId() == null?"":query.getProjectId().toString());
         archiveFile.setSourceType(1);
 
         //责任人怎么取

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -400,7 +400,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
      * @return
      */
     @Override
-    public Long getNextPkeyIdByNodeType(Long pkeyId, Long nodeType) {
+    public Long getNextPkeyIdByNodeType(Long pkeyId, Integer nodeType) {
         WbsTreeContract one = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, pkeyId));
         if (one != null) {
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArTreeContractInitServiceImpl.java

@@ -462,7 +462,7 @@ public class ArTreeContractInitServiceImpl {
             //设置关联
             archiveTree.setExtType(1);
             archiveTree.setExtId(wbsTreeVO2.getId());
-            archiveTree.setExtKeyId(wbsTreeVO2.getId());
+            archiveTree.setExtKeyId(wbsTreeVO2.getPKeyId());
             archiveTree.setExtAttachId(subTree.getId());
             archiveTree.setSort(wbsTreeVO2.getSort());
             archiveTree.setDisplayHierarchy(level.toString());

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractServiceImpl.java

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