feat(REQ-5965) - 调整条件设置的类型

workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnCondition.java

@@ -52,13 +52,13 @@ public class BpmnCondition {
      * 默认的比较值
      */
     @ApiModelProperty(value = "基础属性:默认的比较值", notes = "同时也用于 fieldDateType = radio", example = "1")
-    private String defaultValue;
+    private Object defaultValue;
 
     /**
      * 只有 fieldDateType = checkbox 才有值
      */
     @ApiModelProperty(value = "当 fieldDateType = checkbox时, 选中的值")
-    private List<String> defaultValues;
+    private List<Object> defaultValues;
 
     /**
      * 只有 operator = between 才有值 lt, lte
@@ -122,7 +122,7 @@ public class BpmnCondition {
         this.operator = operator;
     }
 
-    public String getDefaultValue() {
+    public Object getDefaultValue() {
         return defaultValue;
     }
 
@@ -130,11 +130,11 @@ public class BpmnCondition {
         this.defaultValue = defaultValue;
     }
 
-    public List<String> getDefaultValues() {
+    public List<Object> getDefaultValues() {
         return defaultValues;
     }
 
-    public void setDefaultValues(List<String> defaultValues) {
+    public void setDefaultValues(List<Object> defaultValues) {
         this.defaultValues = defaultValues;
     }
 

workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnExpressionTranslator.java

@@ -90,7 +90,7 @@ public final class BpmnExpressionTranslator {
                     "('" +
                     condition.getCode() +
                     "', " +
-                    (NumberUtils.isDigits(condition.getDefaultValue()) ? condition.getDefaultValue() : "'" + condition.getDefaultValue() + "'")
+                    (NumberUtils.isDigits(String.valueOf(condition.getDefaultValue())) ? condition.getDefaultValue() : "'" + condition.getDefaultValue() + "'")
                     +
                     ")";
         } else {