|
@@ -284,30 +284,32 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
archiveAttach = new ArchiveAttachEntity();
|
|
archiveAttach = new ArchiveAttachEntity();
|
|
|
}
|
|
}
|
|
|
Path basePath = Paths.get(archiveDir, SecureUtil.getTenantId(), year);
|
|
Path basePath = Paths.get(archiveDir, SecureUtil.getTenantId(), year);
|
|
|
-
|
|
|
|
|
|
|
+ if(FileUtil.exist(basePath.toString())){
|
|
|
|
|
+ FileUtil.del(basePath.toString());
|
|
|
|
|
+ }
|
|
|
ArchiveAttachEntity finalArchiveAttach = archiveAttach;
|
|
ArchiveAttachEntity finalArchiveAttach = archiveAttach;
|
|
|
// CompletableFuture<Void> task1 = CompletableFuture.runAsync(() -> {
|
|
// CompletableFuture<Void> task1 = CompletableFuture.runAsync(() -> {
|
|
|
- //1 高新技术企业资格证书:基础资源管理-企业基本信息-高企证书上传(按年度)。未上传则为空
|
|
|
|
|
- generateD1(Paths.get(basePath.toString(), "1.高新技术企业资格证书"), year);
|
|
|
|
|
- //2 高新技术企业认定资料:附件补充
|
|
|
|
|
- Path path2 = FileUtil.mkdir(Paths.get(basePath.toString(), "2.高新技术企业认定资料"));
|
|
|
|
|
- this.downloadAttachFiles(path2, Collections.singletonList(finalArchiveAttach.getD3()));
|
|
|
|
|
- //3 加计扣除情况说明:附件补充
|
|
|
|
|
- Path path3 = FileUtil.mkdir(Paths.get(basePath.toString(), "3.加计扣除情况说明"));
|
|
|
|
|
- this.downloadAttachFiles(path3, Collections.singletonList(finalArchiveAttach.getD10()));
|
|
|
|
|
- //4 研发立项决议文件:附件补充
|
|
|
|
|
- Path path4 = FileUtil.mkdir(Paths.get(basePath.toString(), "4.研发立项决议文件"));
|
|
|
|
|
- this.downloadAttachFiles(path4, Collections.singletonList(finalArchiveAttach.getD13()));
|
|
|
|
|
|
|
+ //1 高新技术企业资格证书:基础资源管理-企业基本信息-高企证书上传(按年度)。未上传则为空
|
|
|
|
|
+ generateD1(Paths.get(basePath.toString(), "1.高新技术企业资格证书"), year);
|
|
|
|
|
+ //2 高新技术企业认定资料:附件补充
|
|
|
|
|
+ Path path2 = FileUtil.mkdir(Paths.get(basePath.toString(), "2.高新技术企业认定资料"));
|
|
|
|
|
+ this.downloadAttachFiles(path2, Collections.singletonList(finalArchiveAttach.getD3()));
|
|
|
|
|
+ //3 加计扣除情况说明:附件补充
|
|
|
|
|
+ Path path3 = FileUtil.mkdir(Paths.get(basePath.toString(), "3.加计扣除情况说明"));
|
|
|
|
|
+ this.downloadAttachFiles(path3, Collections.singletonList(finalArchiveAttach.getD10()));
|
|
|
|
|
+ //4 研发立项决议文件:附件补充
|
|
|
|
|
+ Path path4 = FileUtil.mkdir(Paths.get(basePath.toString(), "4.研发立项决议文件"));
|
|
|
|
|
+ this.downloadAttachFiles(path4, Collections.singletonList(finalArchiveAttach.getD13()));
|
|
|
// });
|
|
// });
|
|
|
// CompletableFuture<Void> task2 = CompletableFuture.runAsync(() -> {
|
|
// CompletableFuture<Void> task2 = CompletableFuture.runAsync(() -> {
|
|
|
- //5 高新研发项目汇总表:对外报表-高新口径研发费用报表-高新-研发项目清单表
|
|
|
|
|
- generateD5(Paths.get(basePath.toString(), "5.高新研发项目汇总表"), year, 2);
|
|
|
|
|
- //6 加计扣除研发项目汇总表:对外报表-加计扣除口径研发费用报表-加计扣除-研发项目清单表
|
|
|
|
|
- generateD5(Paths.get(basePath.toString(), "6.加计扣除研发项目汇总表"), year, 3);
|
|
|
|
|
|
|
+ //5 高新研发项目汇总表:对外报表-高新口径研发费用报表-高新-研发项目清单表
|
|
|
|
|
+ generateD5(Paths.get(basePath.toString(), "5.高新研发项目汇总表"), year, 2);
|
|
|
|
|
+ //6 加计扣除研发项目汇总表:对外报表-加计扣除口径研发费用报表-加计扣除-研发项目清单表
|
|
|
|
|
+ generateD5(Paths.get(basePath.toString(), "6.加计扣除研发项目汇总表"), year, 3);
|
|
|
// });
|
|
// });
|
|
|
|
|
|
|
|
-// CompletableFuture<Void> task7_1 = null, task7_2 = null, task7_2_1 = null, task7_2_2 = null, task7_2_3 = null, task7_2_4 = null, task7_2_5 = null, task7_2_6 = null, task7_2_7 = null, task7_2_8 = null;
|
|
|
|
|
-// CompletableFuture<Void> task7_3 = null, task7_4 = null, task7_5 = null, task7_6 = null, task7_7 = null;
|
|
|
|
|
|
|
+//// CompletableFuture<Void> task7_1 = null, task7_2 = null, task7_2_1 = null, task7_2_2 = null, task7_2_3 = null, task7_2_4 = null, task7_2_5 = null, task7_2_6 = null, task7_2_7 = null, task7_2_8 = null;
|
|
|
|
|
+//// CompletableFuture<Void> task7_3 = null, task7_4 = null, task7_5 = null, task7_6 = null, task7_7 = null;
|
|
|
Path path7 = FileUtil.mkdir(Paths.get(basePath.toString(), "7.高新研发项目全套技术资料"));
|
|
Path path7 = FileUtil.mkdir(Paths.get(basePath.toString(), "7.高新研发项目全套技术资料"));
|
|
|
XmFinanceEntity dto = new XmFinanceEntity();
|
|
XmFinanceEntity dto = new XmFinanceEntity();
|
|
|
dto.setYearAndMonth(year);
|
|
dto.setYearAndMonth(year);
|
|
@@ -468,15 +470,6 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
index.incrementAndGet();
|
|
index.incrementAndGet();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// CompletableFuture<Void> task3 = CompletableFuture.runAsync(() -> {
|
|
|
|
|
-// //7.高新研发项目全套技术资料:对外报表-高新口径研发费用报表-高新-研发项目清单中的所有研发项目的全套技术资料,每一个项目,都包括:项目立项表+上传的所有附件;项目实施表(含多个表)+所有附件;项目变更(多个表)+所有附件;项目结题(多个表)+所有附件;委外项目表+所有附件。
|
|
|
|
|
-// generateD7(Paths.get(basePath.toString(), "7.高新研发项目全套技术资料"), year, 2);
|
|
|
|
|
-// });
|
|
|
|
|
-// CompletableFuture<Void> task4 = CompletableFuture.runAsync(() -> {
|
|
|
|
|
-// //8 加计扣除研发项目全套技术资料:对外报表-加计扣除口径研发费用报表-加计扣除-研发项目清单中的所有研发项目的全套技术资料,每一个项目,都包括:项目立项表+上传的所有附件;项目实施表(含多个表)+所有附件;项目变更(多个表)+所有附件;项目结题(多个表)+所有附件;委外项目表+所有附件。
|
|
|
|
|
-// generateD7(Paths.get(basePath.toString(), "8.加计扣除研发项目全套技术资料"), year, 3);
|
|
|
|
|
-// });
|
|
|
|
|
-
|
|
|
|
|
// CompletableFuture<Void> task5 = CompletableFuture.runAsync(() -> {
|
|
// CompletableFuture<Void> task5 = CompletableFuture.runAsync(() -> {
|
|
|
//9 高新研发人员与科技人员资料:改成高新科技人员资料:即科技人员管理-年高新科技人员汇总表资料表,选出:对外报表-高新口径研发费用报表-高新-研发项目清单中项目人员汇总
|
|
//9 高新研发人员与科技人员资料:改成高新科技人员资料:即科技人员管理-年高新科技人员汇总表资料表,选出:对外报表-高新口径研发费用报表-高新-研发项目清单中项目人员汇总
|
|
|
generateD9(Paths.get(basePath.toString(), "9.高新科技人员资料"), year, finalArchiveAttach.getD6());
|
|
generateD9(Paths.get(basePath.toString(), "9.高新科技人员资料"), year, finalArchiveAttach.getD6());
|
|
@@ -559,8 +552,8 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
// task8, task8_1, task8_2, task8_2_1, task8_2_2, task8_2_3, task8_2_4, task8_2_5, task8_2_6, task8_2_7, task8_2_8, task8_3, task8_4, task8_5, task8_6, task8_7,
|
|
// task8, task8_1, task8_2, task8_2_1, task8_2_2, task8_2_3, task8_2_4, task8_2_5, task8_2_6, task8_2_7, task8_2_8, task8_3, task8_4, task8_5, task8_6, task8_7,
|
|
|
// task9, task10, task11, task12, task16, task17).join();
|
|
// task9, task10, task11, task12, task16, task17).join();
|
|
|
// CompletableFuture.allOf(task1, task2, task5,task6,task7,task8,task9,task10,task11,task12,task13,task14,task15,task16,task17).join();
|
|
// CompletableFuture.allOf(task1, task2, task5,task6,task7,task8,task9,task10,task11,task12,task13,task14,task15,task16,task17).join();
|
|
|
-// CompletableFuture.allOf(task1, task2, task5, task6).join();
|
|
|
|
|
-
|
|
|
|
|
|
|
+// CompletableFuture.allOf(task1).join();
|
|
|
|
|
+//
|
|
|
// CompletableFuture<Void> task7_1 = null, task7_2 = null, task7_2_1 = null, task7_2_2 = null, task7_2_3 = null, task7_2_4 = null, task7_2_5 = null, task7_2_6 = null, task7_2_7 = null, task7_2_8 = null;
|
|
// CompletableFuture<Void> task7_1 = null, task7_2 = null, task7_2_1 = null, task7_2_2 = null, task7_2_3 = null, task7_2_4 = null, task7_2_5 = null, task7_2_6 = null, task7_2_7 = null, task7_2_8 = null;
|
|
|
// CompletableFuture<Void> task7_3 = null, task7_4 = null, task7_5 = null, task7_6 = null, task7_7 = null;
|
|
// CompletableFuture<Void> task7_3 = null, task7_4 = null, task7_5 = null, task7_6 = null, task7_7 = null;
|
|
|
// long l = new Date().getTime() - date.getTime();
|
|
// long l = new Date().getTime() - date.getTime();
|