解决冲突

blade-service/blade-business/src/main/java/org/springblade/business/service/StandardInfoService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.business.dto.StandardInfoDTO;
 import org.springblade.business.dto.StandardInfoPrivateJoinDTO;
 import org.springblade.business.entity.StandardInfo;
+import org.springblade.business.vo.StandardInfoDtoVo;
 import org.springblade.business.vo.StandardInfoPrivateJoinVO;
 import org.springblade.business.vo.StandardInfoVO;
 import org.springblade.core.mp.support.Query;

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

@@ -5362,48 +5362,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         }
     }
 
-    @Override
-    @Async("taskExecutor1")
-    public void synchronizedPdf(List<TableInfo> tableInfoList, String nodeId, String classify, String contractId, String projectId) {
-        try {
-            List<String> errorPKeyIds = new ArrayList<>();
-            //单个pdf加载
-            if (tableInfoList != null) {
-                tableInfoList.parallelStream().forEach(tableInfo -> {
-                    R bussPdfInfo = null;
-                    try {
-                        bussPdfInfo = this.getBussPdfInfo(Long.parseLong(tableInfo.getPkeyId()));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (ObjectUtil.isEmpty(bussPdfInfo) || bussPdfInfo.getCode() != 200) {
-                        //如果返回的单张pdfUrl为空，那么表示发生异常，返回异常信息
-                        errorPKeyIds.add(tableInfo.getPkeyId());
-                    }
-                });
-            }
-
-            //发生异常后直接返回，不进行合并
-//        if (errorPKeyIds.size() > 0) {
-//            List<AppWbsTreeContractVO> errorTabs = new LinkedList<>();
-//            for (AppWbsTreeContractVO appWbsTreeContractVO : tableAll) {
-//                if (errorPKeyIds.contains(appWbsTreeContractVO.getPKeyId().toString())) {
-//                    errorTabs.add(appWbsTreeContractVO);
-//                }
-//            }
-//            if (errorTabs.size() > 0) {
-//                List<String> names = errorTabs.stream().map(WbsTreeContract::getNodeName).collect(Collectors.toList());
-//                return R.fail("以下的表在生成pdf文件时发生了异常【" + StringUtils.join(names, "、") + "】");
-//            }
-//        }
-
-            //合并pdf加载
-            this.getBussPdfs(nodeId, classify, contractId, projectId);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new ServiceException("问题");
-        }
-    }
 
     @Override
     public void cancelSample(Long groupId, Long pkeyId, Long contractId, Long sampleId1) throws Exception {