节点公式

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ElementFormulaMapping.java

@@ -25,6 +25,7 @@ public class ElementFormulaMapping extends BaseEntity {
     @Size(max = 20)
     private Long wbsId;
     private Long projectId;
+    // 公式级别 0=元素库级别  1=WBS级别 2=WBS 节点级别 10=项目级别 20=项目节点级别 35=节点参数级别
     private Integer scope;
     private Long paramId;
 

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

@@ -1241,9 +1241,9 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 if (e.executable() && (e.getFormula().getFormula().contains(".weather(") //天气
                         || e.getFormula().getFormula().contains(".maxtembydate(") // 最大气温
                         || e.getFormula().getFormula().contains(".mintembydate(")  // 最小气温
-                        || e.getFormula().getFormula().contains("maxminbydate(")  //最大最小气温
-                        || e.getFormula().getFormula().contains("weathertem(")    // 气温/天气
-                        || e.getFormula().getFormula().contains("weekbydate(")  // 日期计算周几
+                        || e.getFormula().getFormula().contains(".maxminbydate(")  //最大最小气温
+                        || e.getFormula().getFormula().contains(".weathertem(")    // 气温/天气
+                        || e.getFormula().getFormula().contains(".weekbydate(")  // 日期计算周几
                 )) {
                     String tyepData[] = new String[]{"WEATHER","MAXTEMBYDATE","MINTEMBYDATE","MAXMINBYDATE","WEATHERTEM","WEEKBYDATE"};
                     String code ="";