Merge remote-tracking branch 'origin/master'

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ArchiveTreeVO2.java

@@ -183,6 +183,11 @@ public class ArchiveTreeVO2 implements INodeEx<ArchiveTreeVO2> {
 
     private String expDataType;
 
+    /**
+     * 选中的节点集合
+     */
+    private List<String> selectAllNodes;
+
     /**
      * 来源ID
      */

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -281,10 +281,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 					}
 				}
 			}
-			/*executorService.execute(()->{
+			executorService.execute(()->{
 				iossClient.removeFiles(removeFiles);
 				log.debug("文件删完了");
-			});*/
+			});
 
 			//取消未锁定案卷文件关联
 			baseMapper.splitArchvies(projectId);
@@ -318,10 +318,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 						}
 					}
 				}
-				/*executorService.execute(()->{
+				executorService.execute(()->{
 					iossClient.removeFiles(removeFiles);
 					log.debug("文件删完了");
-				});*/
+				});
 
 				baseMapper.splitArchviesByNode(projectId,ancestors,strNodeId);
 			}else{
@@ -347,10 +347,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 						}
 					}
 				}
-				/*executorService.execute(()->{
+				executorService.execute(()->{
 					iossClient.removeFiles(removeFiles);
 					log.debug("文件删完了");
-				});*/
+				});
 
 				//没节点的按合同段
 				baseMapper.splitArchviesByContract(projectId,contractId,treeCode);
@@ -1573,7 +1573,11 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		String treeCode = getAuthCode(contractId);
 		String strNodeId = "";
 		if (nodeId!= null) {
+			ArchiveTreeContract node = archiveTreeContractClient.getArchiveTreeContractById(nodeId);
 			strNodeId  = nodeId.toString();
+			if(node.getContractId()==null || node.getContractId()==-1){
+				treeCode="";
+			}
 		}
 
 		return archiveTreeContractFilter(archiveTreeContracts, treeCode, strNodeId,contractId);

blade-service/blade-business/src/main/java/org/springblade/business/controller/ArchiveFileController.java

@@ -325,7 +325,6 @@ public class ArchiveFileController extends BladeController {
 		if(StringUtils.isNotEmpty(archiveTaskIds)){
 			String[] ids = archiveTaskIds.split(",");
 			for (String id : ids) {
-
 				//生成流程实体
 				TaskVO taskVO = new TaskVO();
 				BeanUtils.copyProperties(startTaskVO, taskVO);
@@ -378,7 +377,15 @@ public class ArchiveFileController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "批量编辑")
 	public R<Boolean> batchEdit(@RequestBody ArchiveFileVO vo){
-		return R.data(this.archiveFileService.updateBatchById(JSONArray.parseArray(JSONObject.toJSONString(vo.getList()), ArchiveFile.class)));
+		List<ArchiveFile> list = JSONArray.parseArray(JSONObject.toJSONString(vo.getList()), ArchiveFile.class);
+		list.stream().forEach(l->{
+			if (l.getIsNeedCertification() == 0){
+				l.setIsCertification(1);
+			}else {
+				l.setIsCertification(0);
+			}
+		});
+		return R.data(this.archiveFileService.updateBatchById(list));
 	}
 
 	/**

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeMapper.xml

@@ -264,8 +264,9 @@
         archive_auto_group_id,
         is_interface_node,
         interface_type,
-        sort
-        FROM m_archive_tree
+        sort,
+        ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM m_archive_tree t2 WHERE t2.parent_id  = t1 .id  and t2.node_type in (0, #{nodeType})) AS "has_children"
+        FROM m_archive_tree t1
         WHERE is_deleted = 0 AND project_id = #{projectId}
         <if test=" tenantId!=null and tenantId!='' ">
             AND tenant_id = #{tenantId}

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

@@ -214,6 +214,15 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
 
         List<ArchiveTreeVO2> archiveTreeVOList = baseMapper.tree2(tenantId, projectId,disPlayTree, nodeType);
         List<ArchiveTreeVO2> treeVO2s = ForestNodeMergerEx.merge(archiveTreeVOList);
+        if (archiveTreeVOList != null && archiveTreeVOList.size() > 0){
+            List<String> list = new ArrayList<>();
+            archiveTreeVOList.stream().forEach(l->{
+                if (l.getHasChildren() == false && l.getIsDisplayTree() == 1){
+                    list.add(l.getId()+"");
+                }
+            });
+            treeVO2s.get(0).setSelectAllNodes(list);
+        }
         //todo 遍历树，找到质检节点，调用getWbsArchiveTree，根据关联层级，拼接上去
 
         //是否获取扩展的wbs节点
@@ -262,7 +271,9 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
         }
         List<ArchiveTree> archiveTrees = baseMapper.selectList(Wrappers.<ArchiveTree>query().lambda()
                 .eq(ArchiveTree::getIsUploadFileDisplayConfigurationTree, 1));
-        String[] idList = ids.split(",");
+//        String[] idList = ids.split(",");
+        String[] split = ids.split(":");
+        String[] idList = split[1].substring(1, split[1].length() - 2).split(",");
         List<String> idQ = Arrays.asList(idList);
         List<String> idList1 = idQ.stream().filter(string -> !string.isEmpty()).collect(Collectors.toList());
         List<String> idList2 = new ArrayList<>();