Merge remote-tracking branch 'origin/dev' into dev

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

@@ -388,10 +388,13 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		ArchivesAutoVO.ApprovalFile spare = null;
 		ArchivesAutoVO.ApprovalFile back = null;
 		if (approvalFiles != null && !approvalFiles.isEmpty()) {
-			// 四要素
+			// todo 四要素 使用名称判断
 			Map<String, List<ArchivesAutoVO.ApprovalFile>> collect = approvalFiles.stream().collect(Collectors.groupingBy(approvalFile -> {
 				if (approvalFile != null &&
-						(approvalFile.getFileName().equals("封面") || approvalFile.getFileName().equals("卷内目录") || approvalFile.getFileName().equals("备考表") || approvalFile.getFileName().equals("背脊"))) {
+						(approvalFile.getFileName().equals("封面") || approvalFile.getFileName().equals("卷内目录") || approvalFile.getFileName().equals("卷内备考表") || approvalFile.getFileName().equals("备考表") || approvalFile.getFileName().equals("背脊"))) {
+					if (approvalFile.getFileName().equals("卷内备考表")) {
+						return "备考表";
+					}
 					return approvalFile.getFileName();
 				}
 				return "0";
@@ -472,51 +475,51 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 					}
 				}
 			}
-			List<ArchivesAutoVO.ApprovalFile> files = vo.getApprovalFileList();;
-			if (files != null) {
-				String tempId = null;
-				if (!files.isEmpty()) {
-					tempId = files.get(0).getId();
+		}
+		List<ArchivesAutoVO.ApprovalFile> files = vo.getApprovalFileList();;
+		if (files != null) {
+			String tempId = null;
+			if (!files.isEmpty()) {
+				tempId = files.get(0).getId();
+			}
+			if (front != null && front.getFileUrl() != null) {
+				if (front.getId() == null && tempId != null) {
+					front.setId(tempId + "_1");
 				}
-				if (front != null && front.getFileUrl() != null) {
-					if (front.getId() == null && tempId != null) {
-						front.setId(tempId + "_1");
-					}
-					if (front.getId() != null) {
-						front.setPdfFileUrl(front.getFileUrl());
-						files.add(0,front);
-					}
+				if (front.getId() != null) {
+					front.setPdfFileUrl(front.getFileUrl());
+					files.add(0,front);
 				}
-				if (cataLog != null && cataLog.getFileUrl() != null) {
-					if (cataLog.getId() == null && tempId != null) {
-						cataLog.setId(tempId  + "_2");
-					}
-					if (cataLog.getId() != null) {
-						cataLog.setPdfFileUrl(cataLog.getFileUrl());
-						if (front != null && front.getFileUrl() != null) {
-							files.add(1,cataLog);
-						} else {
-							files.add(0,cataLog);
-						}
-					}
+			}
+			if (cataLog != null && cataLog.getFileUrl() != null) {
+				if (cataLog.getId() == null && tempId != null) {
+					cataLog.setId(tempId  + "_2");
 				}
-				if (spare != null && spare.getFileUrl() != null) {
-					if (spare.getId() == null && tempId != null) {
-						spare.setId(tempId  + "_3");
-					}
-					if (spare.getId() != null) {
-						spare.setPdfFileUrl(spare.getFileUrl());
-						files.add(spare);
+				if (cataLog.getId() != null) {
+					cataLog.setPdfFileUrl(cataLog.getFileUrl());
+					if (front != null && front.getFileUrl() != null) {
+						files.add(1,cataLog);
+					} else {
+						files.add(0,cataLog);
 					}
 				}
-				if (back != null && back.getFileUrl() != null) {
-					if (back.getId() == null && tempId != null) {
-						back.setId(tempId  + "_4");
-					}
-					if (back.getId() != null) {
-						back.setPdfFileUrl(back.getFileUrl());
-						files.add(back);
-					}
+			}
+			if (spare != null && spare.getFileUrl() != null) {
+				if (spare.getId() == null && tempId != null) {
+					spare.setId(tempId  + "_3");
+				}
+				if (spare.getId() != null) {
+					spare.setPdfFileUrl(spare.getFileUrl());
+					files.add(spare);
+				}
+			}
+			if (back != null && back.getFileUrl() != null) {
+				if (back.getId() == null && tempId != null) {
+					back.setId(tempId  + "_4");
+				}
+				if (back.getId() != null) {
+					back.setPdfFileUrl(back.getFileUrl());
+					files.add(back);
 				}
 			}
 		}