试验-公式

1、数据自变 停止条件判断处理

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

@@ -1481,7 +1481,27 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                                 }
                                                 //终止判断
                                                 List<ElementData> elementData = collect.get(value.getY());
-                                                long count = elementData.stream().filter(e -> e.getValue().equals(split[8])).count();
+                                                long count = 0;
+                                                switch (split[7]) {
+                                                    case "=":
+                                                        count = elementData.stream().filter(e -> e.getValue().equals(split[8])).count();
+                                                        break;
+                                                    case ">":
+                                                        count = elementData.stream().filter(e -> Integer.parseInt(e.getValue().toString()) > Integer.parseInt(split[8])).count();
+                                                        break;
+                                                    case "<":
+                                                        count = elementData.stream().filter(e -> Integer.parseInt(e.getValue().toString()) < Integer.parseInt(split[8])).count();
+                                                        break;
+                                                    case ">=":
+                                                        count = elementData.stream().filter(e -> Integer.parseInt(e.getValue().toString()) >= Integer.parseInt(split[8])).count();
+                                                        break;
+                                                    case "<=":
+                                                        count = elementData.stream().filter(e -> Integer.parseInt(e.getValue().toString()) <= Integer.parseInt(split[8])).count();
+                                                        break;
+                                                    case "!=":
+                                                        count = elementData.stream().filter(e -> !e.getValue().equals(split[8])).count();
+                                                        break;
+                                                }
                                                 if (stop) {
                                                     value.setValue("");
                                                     if (attachData != null) {