公式相关：日期比较

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

@@ -480,17 +480,22 @@ public class CustomFunction {
 
 
     public static Object dateMax(Object range) {
-        if (StringUtils.isNotEmpty(range)) {
-            String[] s = Func.toStr(range).replaceAll("[\\[\\]]", "").split(",\\s+");
-            return dateCp(s[0], s[1], false);
-        }
-        return StringPool.EMPTY;
+        return convert(range,false);
     }
 
     public static Object dateMin(Object range) {
-        if (StringUtils.isNotEmpty(range)) {
-            String[] s = Func.toStr(range).replaceAll("[|]", "").split(",");
-            return dateCp(s[0], s[1], true);
+      return convert(range,true);
+    }
+
+    public static  Object convert(Object range,boolean isAsc){
+        if (Func.isNotEmpty(range)) {
+            if(range instanceof List){
+                range= ((List<Object>) range).get(0);
+            }
+            if( Func.isNotEmpty(range)) {
+                String[] s = Func.toStr(range).replaceAll("[|]", "").split(",");
+                return dateCp(s[0], s[1], isAsc);
+            }
         }
         return StringPool.EMPTY;
     }

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

@@ -1301,7 +1301,7 @@ public class StringUtils {
      * @Author yangyj
      * @Date 2021.12.23 15:08
      **/
-    /*去除有效数字后面的0*/
+    /**去除有效数字后面的0*/
     public static Integer getScale(Object... number) {
         int max = 0;
         if (number != null) {
@@ -1309,7 +1309,7 @@ public class StringUtils {
         }
         return max;
     }
-    /*保留有效数字后面的0*/
+    /**保留有效数字后面的0*/
     public static Integer getScaleZero(Object... number){
         int max = 0;
         if (number != null) {

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

@@ -753,6 +753,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                             });
                             if(ele.size()<relyList.size()){
                                 this.tec.getLog().put(FormulaLog.RELY,fd.getCode()+"@"+fd.getEName()+"@"+fd.getFormula().getFormula().replaceAll("'", ""));
+                                continue;
                             }
                             if(fd.getCoordsList().size()>1&&f.split("[/+\\-*]").length>1){
                                 LinkedHashMap<String,FormData> fdMap =new LinkedHashMap<>();