|
@@ -323,7 +323,13 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
Map<String, Object> variable = new HashMap<>(this.constantMap);
|
|
Map<String, Object> variable = new HashMap<>(this.constantMap);
|
|
Map<String,Object> E=getMap(variable,"E");
|
|
Map<String,Object> E=getMap(variable,"E");
|
|
for(Map.Entry<String,ElementData> se:tip.entrySet()){
|
|
for(Map.Entry<String,ElementData> se:tip.entrySet()){
|
|
- E.put(se.getKey(),se.getValue().getValue());
|
|
|
|
|
|
+ Object value=se.getValue().getValue();
|
|
|
|
+ if(CustomFunction.isNumber(value)){
|
|
|
|
+ E.put(se.getKey(),StringUtils.obj2Double(value));
|
|
|
|
+ }else{
|
|
|
|
+ E.put(se.getKey(),value);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
local.add(new LocalVariable(0,f,variable));
|
|
local.add(new LocalVariable(0,f,variable));
|
|
}
|
|
}
|