试验-公式

1、数据自变公式 判断处理 目前只让其选=号

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

@@ -1481,15 +1481,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                                 }
                                                 //终止判断
                                                 List<ElementData> elementData = collect.get(value.getY());
-                                                for (ElementData elementDatum : elementData) {
-                                                    String string = elementDatum.getValue() + split[7] + split[8] + "?1:0";
-                                                    Expression parse = Expression.parse(string);
-                                                    Object data = parse.calculate(currentMap);
-                                                    if ("1".equals(String.valueOf(data))) {
-                                                        stop = true;
-                                                        break;
-                                                    }
-                                                }
+                                                long count = elementData.stream().filter(e -> e.getValue().equals(split[8])).count();
                                                 if (stop) {
                                                     value.setValue("");
                                                     if (attachData != null) {
@@ -1497,6 +1489,10 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                                         elementData1.setValue("");
                                                     }
                                                 }
+                                                if (count > 0) {
+                                                    //当前截至行不需要清空数据
+                                                    stop = true;
+                                                }
                                             }
                                             if (attachData != null) {
                                                 Map<String, FormData> formDataMap = tec.getFormDataMap();