|
|
|
@ -160,7 +160,12 @@ public class DataServiceImpl implements DataService {
|
|
|
|
|
if (model.getEndTime() != null) {
|
|
|
|
|
sqlWhere = sqlWhere + " AND " + timeField + " < '" + DateUtil.format(model.getEndTime()) + "'";
|
|
|
|
|
}
|
|
|
|
|
String sqlOrder = " ORDER BY " + timeField + " DESC";
|
|
|
|
|
String sqlOrder = " ORDER BY " + timeField;
|
|
|
|
|
if (model.getTimeAsc() != null && model.getTimeAsc() == 1) {
|
|
|
|
|
sqlOrder = sqlOrder + " ASC";
|
|
|
|
|
} else {
|
|
|
|
|
sqlOrder = sqlOrder + " DESC";
|
|
|
|
|
}
|
|
|
|
|
String sqlLimit = "";
|
|
|
|
|
if (model.getPageNum() != null && model.getPageSize() != null) {
|
|
|
|
|
result.setPageNum(model.getPageNum());
|
|
|
|
|