diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java index d625c5ec..b3465a20 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java @@ -109,10 +109,10 @@ public class ExecutionFlow { EdgeConditionBranchNode edge =(EdgeConditionBranchNode)outs.get(i); //出口边 GraphNode nexNode =edge.getOuts().get(0); //出口边指向的节点 if(i==0) { - sb.append("\tif((").append(GroovyExpressionReplacer.groovy(node.getCondition(),null)).append(").equals(").append(GroovyExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append(")){").append("\n"); + sb.append("\tif((").append(GroovyExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append(").equals(").append(GroovyExpressionReplacer.groovy(node.getCondition(),null)).append(")){").append("\n"); }else { if(edge.getValue()!=null && !edge.getValue().trim().isEmpty()) { - sb.append("else if((").append(GroovyExpressionReplacer.groovy(node.getCondition(),null)).append(").equals(").append(GroovyExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append(")){").append("\n"); + sb.append("else if((").append(GroovyExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append(").equals(").append(GroovyExpressionReplacer.groovy(node.getCondition(),null)).append(")){").append("\n"); }else { sb.append("else {").append("\n"); } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/OptionValue.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/OptionValue.java index 9908d0e8..40bc0ca0 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/OptionValue.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/OptionValue.java @@ -32,13 +32,13 @@ public class OptionValue { sb.append("\n").append("else if("); } sb.append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(inOptionParameter.getCode())); - sb.append("=="); + sb.append(".equals("); if(ValueTypeUtil.isString(inOptionParameter.getValueType())){ sb.append(GroovyExpressionReplacer.groovy(item.getInputValue(),"java.lang.String")); }else{ sb.append(GroovyExpressionReplacer.groovy(item.getInputValue())); } - sb.append("){ "); + sb.append(")){ "); sb.append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(parameter.getCode())); sb.append(" =TypeConvertor.getValue("); sb.append(GroovyExpressionReplacer.groovy(item.getValue(),parameter.getValueType())); diff --git a/io.sc.engine.rule.frontend/src/views/shared/TestcaseParameterGrid.vue b/io.sc.engine.rule.frontend/src/views/shared/TestcaseParameterGrid.vue index 43c50983..a13e4506 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/TestcaseParameterGrid.vue +++ b/io.sc.engine.rule.frontend/src/views/shared/TestcaseParameterGrid.vue @@ -184,6 +184,7 @@ const parameterType = arg.form.getFieldValue('parameterType'); const scoreCardVarType = arg.form.getFieldValue('scoreCardVarType'); const indicatorType = arg.form.getFieldValue('indicatorType'); + console.log(indicatorType); if ( (!Tools.isUndefinedOrNull(parameterType) && (parameterType === 'INTERMEDIATE' ||