提交

sd-business/src/main/java/com/sd/business/util/sql/Fields.java

@@ -29,6 +29,19 @@ public class Fields<T> {
         return this;
     }
 
+    public <S, V> Fields<T> select(SFunction<S, V> function, SFunction<T, ?> asFunction) {
+        String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
+        sql.fieldList.add(sql.getSqlFieldName(function) + StringPool.SPACE + as);
+        return this;
+    }
+
+    public <S, V> Fields<T> select(String alias, SFunction<S, V> function, SFunction<T, ?> asFunction) {
+        String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
+        LambdaMeta meta = LambdaUtils.extract(function);
+        sql.fieldList.add(FieldUtil.getSqlFieldName(alias, meta) + StringPool.SPACE + as);
+        return this;
+    }
+
     @SafeVarargs
     public final <S, V> Fields<T> select(SFunction<S, V>... functions) {
         for (SFunction<S, V> function : functions) {
@@ -45,19 +58,6 @@ public class Fields<T> {
         return this;
     }
 
-    public <S, V> Fields<T> select(SFunction<S, V> function, SFunction<T, ?> asFunction) {
-        String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        sql.fieldList.add(sql.getSqlFieldName(function) + StringPool.SPACE + as);
-        return this;
-    }
-
-    public <S, V> Fields<T> select(String alias, SFunction<S, V> function, SFunction<T, ?> asFunction) {
-        String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        LambdaMeta meta = LambdaUtils.extract(function);
-        sql.fieldList.add(FieldUtil.getSqlFieldName(alias, meta) + StringPool.SPACE + as);
-        return this;
-    }
-
     public Fields<T> distinct() {
         sql.distinct = true;
         return this;

sd-business/src/main/java/com/sd/business/util/sql/Where.java

@@ -65,8 +65,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> between(String alias, SFunction<K, V> function, Object val1, Object val2) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return between(sqlFieldName, val1, val2);
+        return between(FieldUtil.getSqlFieldName(alias, function), val1, val2);
     }
 
     public Where<T> between(String sqlFieldName, Object val1, Object val2) {
@@ -81,8 +80,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> eq(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return eq(sqlFieldName, value);
+        return eq(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> eq(String sqlFieldName, Object value) {
@@ -97,8 +95,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> ne(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return ne(sqlFieldName, value);
+        return ne(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> ne(String sqlFieldName, Object value) {
@@ -113,8 +110,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> ge(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return ge(sqlFieldName, value);
+        return ge(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> ge(String sqlFieldName, Object value) {
@@ -129,8 +125,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> gt(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return gt(sqlFieldName, value);
+        return gt(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> gt(String sqlFieldName, Object value) {
@@ -145,8 +140,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> le(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return le(sqlFieldName, value);
+        return le(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> le(String sqlFieldName, Object value) {
@@ -161,8 +155,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> lt(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return lt(sqlFieldName, value);
+        return lt(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> lt(String sqlFieldName, Object value) {
@@ -177,8 +170,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> like(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return like(sqlFieldName, value);
+        return like(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> like(String sqlFieldName, Object value) {
@@ -193,8 +185,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> notLike(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return notLike(sqlFieldName, value);
+        return notLike(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> notLike(String sqlFieldName, Object value) {
@@ -209,8 +200,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> likeLeft(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return likeLeft(sqlFieldName, value);
+        return likeLeft(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> likeLeft(String sqlFieldName, Object value) {
@@ -225,8 +215,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> likeRight(String alias, SFunction<K, V> function, Object value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return likeRight(sqlFieldName, value);
+        return likeRight(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> likeRight(String sqlFieldName, Object value) {
@@ -241,8 +230,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> in(String alias, SFunction<K, V> function, Collection<?> value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return in(sqlFieldName, value);
+        return in(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> in(String sqlFieldName, Collection<?> value) {
@@ -254,8 +242,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> in(String alias, SFunction<K, V> function, Object... value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return in(sqlFieldName, value);
+        return in(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     /**
@@ -266,8 +253,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> notIn(String alias, SFunction<K, V> function, Collection<?> value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return notIn(sqlFieldName, value);
+        return notIn(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     public Where<T> notIn(String sqlFieldName, Collection<?> value) {
@@ -279,8 +265,7 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
     }
 
     public <K, V> Where<T> notIn(String alias, SFunction<K, V> function, Object... value) {
-        String sqlFieldName = FieldUtil.getSqlFieldName(alias, function);
-        return notIn(sqlFieldName, value);
+        return notIn(FieldUtil.getSqlFieldName(alias, function), value);
     }
 
     @Override