Merge branch 'lihb' of http://219.151.181.73:3000/zhuwei/bladex into test-merge-02

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

@@ -2003,7 +2003,6 @@ public class ExcelTabController extends BladeController {
             throw new RuntimeException(e);
         }
 
-
         //公式填充
         executionTime.info("----公式填充执行----");
         this.excelTabService.formulaFillData(tableInfoList, Long.parseLong(nodeId), ExecuteType.INSPECTION);
@@ -2013,6 +2012,9 @@ public class ExcelTabController extends BladeController {
             R.success("数据未发生变化");
         }
         executionTime.info("----公式填充执行完毕----");
+
+        //把CL08 和CL10 的监理表添加进去
+
         //保存数据到数据库
         R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList);
         RandomNumberHolder.RandomTemplateTypeclear();

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

@@ -1916,7 +1916,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                 if(designed == null || height == null){
                                     continue;
                                 }
-                                BigDecimal v = designed.add(height.divide(new BigDecimal(100)));
+                                BigDecimal v = designed.add(height.divide(new BigDecimal(1000)));
                                 //第5列，索引为4
                                 list.add(v.doubleValue() + "_^_"+ i + "_" + index);
                             }