diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index afa3d026..9aa8c704 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -84,7 +84,6 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; -import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import static com.jero.modules.activiti.common.ActivitiCommon.*; @@ -450,35 +449,25 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl generate(ProcessStandardComplianceCheck scc) throws Exception { String splitFileSource = scc.getSplitFileSource(); - CompletableFuture> detailInfoListFuture; - CompletableFuture> modelExcelVOListFuture; - + List detailInfoList; // 找到拆分数据 if (StrUtil.isBlank(splitFileSource)) { MultipartFile splitFile = this.getFileById(scc.getSplitFile()); - detailInfoListFuture = CompletableFuture.supplyAsync(() -> this.getSplitData(scc, splitFile)); + detailInfoList = this.getSplitData(scc, splitFile); } else { - detailInfoListFuture = CompletableFuture.supplyAsync(() -> this.getSplitDataByStandard(scc)); - // 是否与上一版本一致 + detailInfoList = this.getSplitDataByStandard(scc); + // 是否与上一般一致 String isSameLastVersion = scc.getIsSameLastVersion(); if (YesOrNoEnum.NO.getValue().equals(isSameLastVersion)) { - detailInfoListFuture = detailInfoListFuture.thenApply(details -> details.stream() - .filter(detail -> YesOrNoEnum.NO.getValue().equals(detail.getIsSameAsPrevVersion())) - .collect(Collectors.toList())); + // 过滤出也为否的数据 + detailInfoList = detailInfoList.stream().filter(detail -> YesOrNoEnum.NO.getValue().equals + (detail.getIsSameAsPrevVersion())).collect(Collectors.toList()); } } - - // 获取模型文件并转换 + // 获取两个文件 MultipartFile modelFile = this.getFileById(scc.getModelFile()); - modelExcelVOListFuture = CompletableFuture.supplyAsync(() -> this.getModelExcelData(modelFile)); - - // 等待两个异步操作完成 - CompletableFuture.allOf(detailInfoListFuture, modelExcelVOListFuture).join(); - - // 结合两个文件的数据 - List detailInfoList = detailInfoListFuture.get(); - List modelExcelVOList = modelExcelVOListFuture.get(); - + // 文件内容转换 + List modelExcelVOList = this.getModelExcelData(modelFile); // 根据主表数据和车型文件生成子表数据并保存 return this.saveAllDetailData(modelExcelVOList, detailInfoList); } @@ -1127,6 +1116,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl