diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index 209a34f..c1504f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -97,7 +97,9 @@ //生成证书报告的,需要改变为动态选择性 originFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(ORIGINAL_RECORD_APPROVAL, "数据打印", null, map, true, null, customOriginUrls), threadPool); - parallelCreateFile(originFutureTask, certificateFutureTask, id, map); + if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map)) { + return; + } } singleCreateFile(originFutureTask, certificateFutureTask, id, map); } @@ -145,7 +147,7 @@ } } - private void parallelCreateFile(CompletableFuture originFutureTask, CompletableFuture certificateFutureTask, Long id, Map map) { + private Boolean parallelCreateFile(CompletableFuture originFutureTask, CompletableFuture certificateFutureTask, Long id, Map map) { if (certificateFutureTask != null && originFutureTask != null) { CompletableFuture tempCertificateFutureTask = certificateFutureTask; CompletableFuture tempOriginFutureTask = originFutureTask; @@ -170,9 +172,12 @@ } } ).join(); + return true; } + return false; } + /** * 异步执行核查记录审批流生成证书报告 *