fix datetime filter bug

wind · wind · commit 0a221895a81e · 2016-10-25T15:00:04.000+08:00
diff --git a/src/com/web/spring/datatable/TableQuery.java b/src/com/web/spring/datatable/TableQuery.java
@@ -201,11 +201,11 @@ public StringBuilder getFilterQuery() {
                         }
                     }
                     if (StringHelper.isNotEmpty(columnDef.getSearchTo())) {
-                        if(Validate.isDate(columnDef.getSearchFrom())) {
-                            paramList.add("" + columnDef.getName() + " < '" + columnDef.getSearchFrom() + "'");
+                        if(Validate.isDate(columnDef.getSearchTo())) {
+                            paramList.add("" + columnDef.getName() + " < '" + columnDef.getSearchTo() + "'");
                         }
                         else {
-                            paramList.add("" + columnDef.getName() + " < " + columnDef.getSearchFrom());
+                            paramList.add("" + columnDef.getName() + " < " + columnDef.getSearchTo());
                         }
                     }
                 }
@@ -222,11 +222,11 @@ public StringBuilder getFilterQuery() {
                         }
                     }
                     if (StringHelper.isNotEmpty(columnDef.getSearchTo())) {
-                        if(Validate.isDate(columnDef.getSearchFrom())) {
-                            paramList.add("" + columnDef.getName() + " < '" + columnDef.getSearchFrom() + "'");
+                        if(Validate.isDate(columnDef.getSearchTo())) {
+                            paramList.add("" + columnDef.getName() + " < '" + columnDef.getSearchTo() + "'");
                         }
                         else {
-                            paramList.add("" + columnDef.getName() + " < " + columnDef.getSearchFrom());
+                            paramList.add("" + columnDef.getName() + " < " + columnDef.getSearchTo());
                         }
                     }
                     if (StringHelper.isNotEmpty(columnDef.getSearch())) {

Original file line number	Diff line number	Diff line change
`@@ -201,11 +201,11 @@ public StringBuilder getFilterQuery() {`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`	`if (StringHelper.isNotEmpty(columnDef.getSearchTo())) {`
`204`		`- if(Validate.isDate(columnDef.getSearchFrom())) {`
`205`		`- paramList.add("" + columnDef.getName() + " < '" + columnDef.getSearchFrom() + "'");`
	`204`	`+ if(Validate.isDate(columnDef.getSearchTo())) {`
	`205`	`+ paramList.add("" + columnDef.getName() + " < '" + columnDef.getSearchTo() + "'");`
`206`	`206`	`}`
`207`	`207`	`else {`
`208`		`- paramList.add("" + columnDef.getName() + " < " + columnDef.getSearchFrom());`
	`208`	`+ paramList.add("" + columnDef.getName() + " < " + columnDef.getSearchTo());`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`	`}`
`@@ -222,11 +222,11 @@ public StringBuilder getFilterQuery() {`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`if (StringHelper.isNotEmpty(columnDef.getSearchTo())) {`
`225`		`- if(Validate.isDate(columnDef.getSearchFrom())) {`
`226`		`- paramList.add("" + columnDef.getName() + " < '" + columnDef.getSearchFrom() + "'");`
	`225`	`+ if(Validate.isDate(columnDef.getSearchTo())) {`
	`226`	`+ paramList.add("" + columnDef.getName() + " < '" + columnDef.getSearchTo() + "'");`
`227`	`227`	`}`
`228`	`228`	`else {`
`229`		`- paramList.add("" + columnDef.getName() + " < " + columnDef.getSearchFrom());`
	`229`	`+ paramList.add("" + columnDef.getName() + " < " + columnDef.getSearchTo());`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`if (StringHelper.isNotEmpty(columnDef.getSearch())) {`