附件生成info

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -24,6 +24,7 @@ import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 import org.springblade.business.entity.ContractLog;
+import org.springblade.business.entity.InformationQuery;
 import org.springblade.business.feign.ContractLogClient;
 import org.springblade.business.feign.InformationQueryClient;
 import org.springblade.business.vo.SaveContractLogVO;
@@ -1951,7 +1952,14 @@ public class ExcelTabController extends BladeController {
         updateWrapper.set("is_tab_pdf", 2);
         wbsTreeContractService.update(updateWrapper);
         // 合并后
-
+        //如果上传文件前没有保存过，则直接生成一条基础数据
+        String sql = "select pdf_url,e_visa_pdf_url,pdf_trial_url,pdf_trial_url_position,status from u_information_query where classify='" + classify + "' and wbs_id='" + nodeId + "' and contract_id='" + contractId + "'";
+        List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
+        if (maps.size() == 0) {
+            InformationQuery query = new InformationQuery();
+            query.setId(SnowFlakeUtil.getId());
+            query.setWbsId(Long.parseLong(nodeId));
+        }
         excelTabService.getBussPdfs(nodeId, classify, contractId, projectId);
 
         return R.data(tableFile.getId());

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

@@ -1728,7 +1728,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 } else {
                     R bussPdfInfo = this.getBussPdfInfo(wbsInfo.getPKeyId());
                     if (bussPdfInfo.getCode() == 200) {
-                        data.add(bussPdfInfo.getData() + "");
+                        if (StringUtils.isNotBlank(bussPdfInfo.getData()+"")) {
+                            data.add(bussPdfInfo.getData() + "");
+                        }
                     }
                 }
 //                }
@@ -1740,24 +1742,25 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         if (tabpdf2.exists()) {
             tabpdf2.delete();
         }
-
-        //资料填报原始pdf合并
-        FileUtils.mergePdfPublicMethods(data, listPdf);
-        BladeFile bladeFile = this.newIOSSClient.uploadFile(nodeId + ".pdf", listPdf);
-
-        //获取当前填报节点sort
-        WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, nodeId));
-        System.out.println("wbsTreeContract==" + wbsTreeContract);
-        //获取顺序
-        int sort = 0;
-        if (ObjectUtil.isNotEmpty(wbsTreeContract)) {
-            if (wbsTreeContract.getSort() != null) {
-                sort = wbsTreeContract.getSort();
-                contractId = wbsTreeContract.getContractId();
+        if (data.size() >= 1) {
+            //资料填报原始pdf合并
+            FileUtils.mergePdfPublicMethods(data, listPdf);
+            BladeFile bladeFile = this.newIOSSClient.uploadFile(nodeId + ".pdf", listPdf);
+
+            //获取当前填报节点sort
+            WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, nodeId));
+            System.out.println("wbsTreeContract==" + wbsTreeContract);
+            //获取顺序
+            int sort = 0;
+            if (ObjectUtil.isNotEmpty(wbsTreeContract)) {
+                if (wbsTreeContract.getSort() != null) {
+                    sort = wbsTreeContract.getSort();
+                    contractId = wbsTreeContract.getContractId();
+                }
             }
+            String sql = "update u_information_query set pdf_url ='" + bladeFile.getLink() + "' , sort = " + sort + " where classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "' ";
+            jdbcTemplate.execute(sql);
         }
-        String sql = "update u_information_query set pdf_url ='" + bladeFile.getLink() + "' , sort = " + sort + " where classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "' ";
-        jdbcTemplate.execute(sql);
     }
 
     @Override