|
@@ -442,6 +442,9 @@ public class cashbill extends Controller {
|
|
|
if (whereObject.containsKey("remarks") && !"".equals(whereObject.getString("remarks"))) {
|
|
|
where = where + " and t1.remarks like'%" + whereObject.getString("remarks") + "%' ";
|
|
|
}
|
|
|
+ if (whereObject.containsKey("period") && !"".equals(whereObject.getString("period"))) {
|
|
|
+ where = where + " and t1.period like'%" + whereObject.getString("period") + "%' ";
|
|
|
+ }
|
|
|
if (whereObject.containsKey("agentinfo") && !"".equals(whereObject.getString("agentinfo"))) {
|
|
|
where = where + " and(t2.enterprisename like'%" + whereObject.getString("agentinfo") + "%'"
|
|
|
+ " or t4.agentnum like '%" + whereObject.getString("agentinfo") + "%'"
|
|
@@ -449,7 +452,7 @@ public class cashbill extends Controller {
|
|
|
}
|
|
|
}
|
|
|
if (pageSorting.equals("''")) {
|
|
|
- pageSorting = "status desc, createdate desc";
|
|
|
+ pageSorting = "status desc, period desc";
|
|
|
}
|
|
|
QuerySQL querySQL = queryList(where);
|
|
|
querySQL.setOrderBy(pageSorting);
|