合格率显示问题

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

@@ -658,9 +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();
-           if(op.isPresent()){
-               return StringUtils.number2String(op.get(),1)+"%";
-           }
+            return op.map(o -> StringUtils.number2String(o, 1) + "%").orElseGet(rates::toString);
         }
         return "/";
     }

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

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