Merge branch 'master' into 4.2.0

Author: zhou-hao

hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/param/Term.java

@@ -137,7 +137,7 @@ public Term addTerm(Term term) {
     public void setColumn(String column) {
         if (column == null) return;
         if (column.contains("$")) {
-            String tmp[] = column.split("[$]");
+            String[] tmp = column.split("[$]");
             setTermType(tmp[1]);
             column = tmp[0];
             if (tmp.length > 2) {
@@ -149,7 +149,7 @@ public void setColumn(String column) {
 
     public void setTermType(String termType) {
         if (termType.contains("$")) {
-            String tmp[] = termType.split("[$]");
+            String[] tmp = termType.split("[$]");
             termType = tmp[0];
             if (tmp.length > 1) {
                 options.addAll(Arrays.asList(tmp).subList(1, tmp.length));
@@ -164,9 +164,9 @@ public void setTermType(String termType) {
     @SneakyThrows
     public Term clone() {
         Term term = ((Term) super.clone());
+        term.setTermType(termType);
         term.setColumn(column);
         term.setValue(value);
-        term.setTermType(termType);
         term.setType(type);
         term.setTerms(terms.stream().map(Term::clone).collect(Collectors.toList()));
         term.setOptions(new ArrayList<>(getOptions()));

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/DateTimeCodec.java

@@ -115,6 +115,9 @@ public Object decode(Object data) {
         if (toType == String.class) {
             return DateTimeUtils.format(((Date) data), format);
         }
+        if (toType == Timestamp.class){
+            return new Timestamp(((Date) data).getTime());
+        }
 
         return data;
     }

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/mapping/defaults/DefaultDelete.java

@@ -103,8 +103,8 @@ public ME or() {
     public ME and(String column, String termType, Object value) {
         if (value != null) {
             Term term = new Term();
-            term.setColumn(column);
             term.setTermType(termType);
+            term.setColumn(column);
             term.setValue(value);
             term.setType(Term.Type.and);
             terms.add(term);
@@ -116,8 +116,8 @@ public ME and(String column, String termType, Object value) {
     public ME or(String column, String termType, Object value) {
         if (value != null) {
             Term term = new Term();
-            term.setColumn(column);
             term.setTermType(termType);
+            term.setColumn(column);
             term.setValue(value);
             term.setType(Term.Type.or);
             terms.add(term);

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/mapping/defaults/DefaultUpdate.java

@@ -193,8 +193,8 @@ public ME or() {
     public ME and(String column, String termType, Object value) {
         if (value != null) {
             Term term = new Term();
-            term.setColumn(column);
             term.setTermType(termType);
+            term.setColumn(column);
             term.setValue(value);
             term.setType(Term.Type.and);
             terms.add(term);
@@ -206,8 +206,8 @@ public ME and(String column, String termType, Object value) {
     public ME or(String column, String termType, Object value) {
         if (value != null) {
             Term term = new Term();
-            term.setColumn(column);
             term.setTermType(termType);
+            term.setColumn(column);
             term.setValue(value);
             term.setType(Term.Type.or);
             terms.add(term);

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/operator/dml/query/TermOperator.java

@@ -10,8 +10,8 @@ public class TermOperator implements Supplier<Term> {
     private Term term = new Term();
 
     public TermOperator(String column, String termType, Object value) {
-        term.setColumn(column);
         term.setTermType(termType);
+        term.setColumn(column);
         term.setValue(value);
     }