汇总 提交

blade-service/blade-manager/src/main/java/org/springblade/manager/bean/TableInfo.java

@@ -60,8 +60,11 @@ public class TableInfo {
     /**
      * 源文件路径
      */
+
     private String sourceUrl;
 
+    private String nodeName;
+
     /**
      * pdfUrl
      */

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

@@ -2269,8 +2269,6 @@ public class ExcelTabController extends BladeController {
             singnType = "";
         }
 
-      //  dataInfo.getJSONObject("dataInfo").getJSONArray("orderList");
-
         JSONObject tableInfo1 = dataArray.getJSONObject(0);
         String nodeId = tableInfo1.getString("nodeId");
         String contractId = tableInfo1.getString("contractId");
@@ -2338,11 +2336,7 @@ public class ExcelTabController extends BladeController {
             tableInfoList.parallelStream().forEach(tableInfo -> {
                 R bussPdfInfo = null;
                 try {
-                    /*if(finalSingnType.equals("1") && tableInfo.getProjectId().equals("1630011899725201410") && (tableInfo.getIsTypePrivatePid().equals("1559714325173080065") || tableInfo.getIsTypePrivatePid().equals("1559479719236702210") )){
-                        System.out.println("12312312");
-                    }else{*/
-                        bussPdfInfo = excelTabService.getBussPdfInfo(Long.parseLong(tableInfo.getPkeyId()));
-                 //   }
+                    bussPdfInfo = excelTabService.getBussPdfInfo(Long.parseLong(tableInfo.getPkeyId()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -2386,6 +2380,7 @@ public class ExcelTabController extends BladeController {
         executionTime.info("缓存删除耗时");
         executionTime.brief();
         return R.data(result.getMsg());
+       // return R.data("1123");
     }
 
     /*并发加载表单数据*/

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

@@ -180,7 +180,7 @@ public class SubTable {
     /*获取最终输出的项目信息*/
     public List<Item> getPutOutList(){
         /*初始化group,保留原先内容，只做同KEY覆盖*/
-        //initOriginal();
+        initOriginal();
         List<Item> itemList = new ArrayList<>(group.values());
         if(this.mainList!=null){
             List<String> itemNameIndex = this.mainList.stream().map(e->FormulaUtils.parseItemName(e.getEName()).trim()).collect(Collectors.toList());

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

@@ -360,6 +360,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 JSONObject dataInfo2 = dataArray.getJSONObject(m);
                 //
                 tableInfo.setContractId(dataInfo2.getString("contractId"));
+                tableInfo.setNodeName(dataInfo2.getString("nodeName"));
                 tableInfo.setPkeyId(dataInfo2.getString("pkeyId"));
                 tableInfo.setProjectId(dataInfo2.getString("projectId"));
                 //huangjn 填报的类型，施工或监理

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

@@ -1112,7 +1112,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 wbsTreeContract.setIsBussShow(1); // 是否隐藏表
                 wbsTreeContract.setTabFileType(1);//没有上传附件
                 wbsTreeContract.setPdfUrl("");
-                wbsTreeContract.setIsCopeTab(3); // 代表频率
+                wbsTreeContract.setIsCopeTab(13); // 代表频率
+
                 addList.add(wbsTreeContract);
 
                 int dataSize = 0;