|
@@ -132,7 +132,7 @@ public class ExtFormulaParser {
|
|
|
String value = null;
|
|
|
if (o != null) {
|
|
|
cl = o.getClass();
|
|
|
- if (cl == Integer.class || cl == UFDouble.class || cl == Double.class)
|
|
|
+ if (cl == Integer.class || cl == UFDouble.class || cl == Double.class||cl == Number.class)
|
|
|
value = o.toString();
|
|
|
else
|
|
|
value = "\"" + o.toString() + "\"";
|
|
@@ -149,7 +149,7 @@ public class ExtFormulaParser {
|
|
|
String value = null;
|
|
|
if (o != null) {
|
|
|
cl = o.getClass();
|
|
|
- if (cl == Integer.class || cl == UFDouble.class || cl == Double.class)
|
|
|
+ if (cl == Integer.class || cl == UFDouble.class || cl == Double.class||cl == Number.class)
|
|
|
value = o.toString();
|
|
|
else
|
|
|
value = "\"" + o.toString() + "\"";
|
|
@@ -245,6 +245,8 @@ public class ExtFormulaParser {
|
|
|
oTarget = new UFBoolean(value.toString());
|
|
|
} else if (cl == UFDate.class) {
|
|
|
oTarget = new UFDate(value.toString());
|
|
|
+ }else if(cl == Double.class||cl == Number.class) {
|
|
|
+ oTarget = Double.parseDouble(value.toString());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -321,7 +323,7 @@ public class ExtFormulaParser {
|
|
|
String value = null;
|
|
|
if (o != null) {
|
|
|
cl = o.getClass();
|
|
|
- if (cl == Integer.class || cl == UFDouble.class || cl == Double.class)
|
|
|
+ if (cl == Integer.class || cl == UFDouble.class || cl == Double.class||cl == Number.class)
|
|
|
value = o.toString();
|
|
|
else
|
|
|
value = "\"" + o.toString() + "\"";
|
|
@@ -337,7 +339,7 @@ public class ExtFormulaParser {
|
|
|
String value = null;
|
|
|
if (o != null) {
|
|
|
cl = o.getClass();
|
|
|
- if (cl == Integer.class || cl == UFDouble.class || cl == Double.class)
|
|
|
+ if (cl == Integer.class || cl == UFDouble.class || cl == Double.class||cl == Number.class)
|
|
|
value = o.toString();
|
|
|
else
|
|
|
value = "\"" + o.toString() + "\"";
|
|
@@ -415,6 +417,8 @@ public class ExtFormulaParser {
|
|
|
oTarget = new UFDate(value.toString());
|
|
|
} else if (cl == UFDateTime.class) {
|
|
|
oTarget = new UFDateTime(value.toString());
|
|
|
+ }else if(cl == Double.class||cl == Number.class) {
|
|
|
+ oTarget = Double.parseDouble(value.toString());
|
|
|
}
|
|
|
}
|
|
|
}
|