修改 predicate eq 函数

潘钊
1 parent 64145188
Showing 1 changed file with 11 additions and 3 deletions
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
@@ -34,7 +34,16 @@ public class PredicatesBuilder {
         Class<?> leftType = expression.getJavaType();
         Class<?> rightType = object.getClass();
-        if (Number.class.isAssignableFrom(leftType) &&
+		if(Date.class.isAssignableFrom(leftType) &&
+				String.class.isAssignableFrom(rightType)){
+			DateTime dateTime = new DateTime(object);
+			return cb.equal(expression, dateTime.toDate());
+		}
+		else {
+			return cb.equal(expression, object);
+		}
+
+        /*if (Number.class.isAssignableFrom(leftType) &&
                 (Number.class.isAssignableFrom(rightType) || String.class.isAssignableFrom(rightType))) { // Number == Number/String
             return cb.equal(expression, object);
         } else if (String.class.isAssignableFrom(leftType) &&
@@ -52,8 +61,7 @@ public class PredicatesBuilder {
             return cb.equal(expression, dateTime.toDate());
         } else {
             throw new RuntimeException("eq 不支持类型组合：" + expression.getJavaType() + "==" + object.getClass());
-        }
-
+        }*/
 	}
 	public static Predicate ne(CriteriaBuilder cb,Path<?> expression, Object object){