白马项目合格率默认处理

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -567,7 +567,7 @@ public class CustomFunction {
      **/
     public static Object ladder(List<Object> data) {
         if (Func.isNotEmpty(data)) {
-            OptionalDouble op = data.stream().map(StringUtils::handleNull).filter(StringUtils::isNumber).mapToDouble(Double::parseDouble).min();
+            OptionalDouble op = data.stream().map(StringUtils::handleNull).map(o->o.replace("%","")).filter(StringUtils::isNumber).mapToDouble(Double::parseDouble).min();
             if (op.isPresent()) {
                 return op.getAsDouble() >= 90 ? 90 : 70;
             }
@@ -658,7 +658,7 @@ public class CustomFunction {
         List<Object> rate =obj2ListNe(rates);
         if(Func.isNotEmpty(rate)&&rate.stream().anyMatch(StringUtils::isNotEmpty)){
            Optional<Object> op= rate.stream().filter(BaseUtils::isNumber).findAny();
-            return op.map(o -> StringUtils.number2String(o, 1) + "%").orElseGet(rates::toString);
+            return op.map(o -> StringUtils.number2String(o, 1) + "%").orElseGet(()->rate.get(0).toString());
         }
         return "/";
     }
@@ -667,7 +667,6 @@ public class CustomFunction {
 
 
 
-
     public String checkItems(List<String> items, List<Object> l1, List<Object> l2, List<Object> l3, List<Object> l4, List<Object> l5, List<Object> l6, List<Object> l7, List<Object> l8, List<Object> l9, List<Object> l10, List<Object> l11, List<Object> l12) {
         List<List<Object>> data = new ArrayList<>(Arrays.asList(l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12));
         List<String> result = new ArrayList<>();

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

@@ -1806,13 +1806,19 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     Formula f = fd.getFormula();
                     fd.setValues(FormulaUtils.setScale(f.getScale(),fd.getValues()));
                 }
+            }
+        }
+        /*合格率显示*/
+        if(tec.getProjectId().equals(1612329251049537537L)){
+            tec.getFormDataMap().values().forEach(fd->{
                 /*合格率显示*/
-                if(fd.getEName().contains("合格率")&&fd.getCoordsList().size()==1&&tec.getProjectId().equals(1612329251049537537L)){
-                    fd.getValues().forEach(e->{
+                if(fd.getEName().contains("合格率")&&fd.getCoordsList().size()==1&&!fd.getEName().contains("意见")){
+                    fd.setUpdate(1);
+                   fd.getValues().forEach(e->{
                         e.setValue(CustomFunction.passRateDisplay(e.getValue()));
                     });
                 }
-            }
+            });
         }
         /*检查超页情况*/
         if(tec.isNew){