Merge remote-tracking branch 'origin/master'

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -375,7 +375,7 @@ public class FormulaUtils {
 
 
     private static boolean isContainKeywords(String s) {
-        List<String> keywords = Arrays.asList( "：", "个","附录","抽查","测","求","小于","大于","检查","仪","按","不","各","记录","且","规定");
+        List<String> keywords = Arrays.asList( "：", "个","附录","抽查","测","求","小于","大于","检查","仪","按","不","各","记录","且","规定","值或实");
         return keywords.stream().anyMatch(s::contains);
     }
 
@@ -416,11 +416,14 @@ public class FormulaUtils {
             "搭接宽度(mm)_≥50(横向)_尺量：抽查2%_实测值或实测偏差值"
             ,"竖直度（mm）_挖孔桩_0.5%桩长，且≤200_铅锤线：每桩检测_实测值或实测偏差值"
             , "2△_压浆压力值 （Mpa）_满足施工技术 规范规定_查油压表读书;每管道检查_实测值或实测偏差值"
+            , "基底承载力(KPa)_不小于设计_实测值或实测偏差值"
     );
 
-   /* public static void main(String[] args) {
+/*
+    public static void main(String[] args) {
         itemNames.stream().map(FormulaUtils::parseItemName).forEach(System.out::println);
-    }*/
+    }
+*/
 
     /**
      * @Description 深度拷贝

blade-service/blade-manager/src/main/java/com/mixsmart/utils/StringUtils.java

@@ -1302,11 +1302,19 @@ public class StringUtils {
     public static Integer getScale(Object... number) {
         int max = 0;
         if (number != null) {
+            return getScale(Arrays.asList(number));
+        }
+        return max;
+    }
+
+    private static Integer getScale(List<Object> number){
+        int max=0;
+        if(ListUtils.isNotEmpty(number)){
             for (Object n : number) {
                 if (StringUtils.isNotEmpty(n)) {
                     String[] sa = n.toString().split(",");
                     for (String s : sa) {
-                        Matcher m = RegexUtils.matcher("(\\d)+.(\\d)+", s);
+                        Matcher m = RegexUtils.matcher("(\\d)+.(\\d)*[1-9]", s);
                         if (m.find()) {
                             int cp = new StringBuilder(m.group()).reverse().toString().indexOf(".");
                             if (cp < 5) {
@@ -1320,6 +1328,11 @@ public class StringUtils {
         return max;
     }
 
+//    public static void main(String[] args) {
+//         List<Object> list = Arrays.asList("16.001",27.0,5,6);
+//        System.out.println(getScale(list));
+//        System.out.println(getScale(16.00,17.00,10,8));
+//    }
 
     /**
      * @return java.lang.String

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

@@ -376,7 +376,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             if(Func.isNotEmpty(missingList)){
                 /*2从当前节点的兄弟节点中查找匹配的元素*/
                 CurrentNode currentNode = this.tec.getCurrentNode();
-                List<Map<String,Object>> tableNamePkIdsMaps= this.jdbcTemplate.queryForList("select c.init_table_name tableName,c.p_key_id pkId,c.html_url url from (select b.id from (select * from m_wbs_tree_contract  where p_key_id="+currentNode.getPkId()+") a join  m_wbs_tree_contract b on b.parent_id=a.parent_id where  b.contract_id="+this.tec.getContractId()+" and b.is_deleted=0) k join m_wbs_tree_contract c on c.parent_id = k.id where  c.contract_id="+this.tec.getContractId()+" and c.is_deleted=0 ");
+                List<Map<String,Object>> tableNamePkIdsMaps= this.jdbcTemplate.queryForList("select c.init_table_name tableName,c.p_key_id pkId,c.html_url url from (select b.id from m_wbs_tree_contract a join m_wbs_tree_contract b on (a.contract_id=b.contract_id and b.ancestors like CONCAT(a.ancestors,'%')) where a.p_key_id="+currentNode.getPkId()+" and b.is_deleted=0 and b.node_type=6 ORDER BY b.sort) k join m_wbs_tree_contract c on c.parent_id = k.id where  c.contract_id="+tec.getContractId()+" and c.is_deleted=0 ");
                 if(Func.isNotEmpty(tableNamePkIdsMaps)){
                    // removeList.clear();
                     missingList.forEach(miss->{
@@ -1552,7 +1552,7 @@ public  List<ElementData> setScale(Integer scale,List<ElementData> data){
                              if(op.isPresent()){
                                  RangeInfo d = op.get();
                                  d.build();
-                                 data=  d.getPassList().stream().mapToInt(Func::toInt).count();
+                                 data=  d.getPassList().stream().mapToInt(Func::toInt).sum();
                              }
                          }else{
                              FormData dataFd=tec.formDataMap.get(codeList.get(0));