|
|
@@ -32,7 +32,7 @@ public class supplyanddemand extends Controller {
|
|
|
*排序条件设置
|
|
|
*/
|
|
|
String[] sortfield = {"case when t1.fstatus in('已解决','已过期') then 0 when t1.fstatus='对接中'then 1 else 2 end desc, t1.tsupplyanddemandid desc"};
|
|
|
- String sort = getSort(sortfield, "case when t1.fstatus in('已解决','已过期') then 0 when t1.fstatus='对接中'then 1 else 2 end desc, t1.tsupplyanddemandid desc");
|
|
|
+ String sort = getSort(sortfield, "case when t1.fstatus in('已解决','已过期') then 0 when t1.fstatus='对接中'then 1 else 2 end desc, t4.createdate desc,t1.tsupplyanddemandid desc");
|
|
|
/**
|
|
|
* 过滤条件设置
|
|
|
*/
|
|
|
@@ -70,7 +70,7 @@ public class supplyanddemand extends Controller {
|
|
|
sqlFactory.addParameter("siteid", siteid);
|
|
|
sqlFactory.addParameter("userid", userid);
|
|
|
sqlFactory.addParameter_SQL("where", where);
|
|
|
-
|
|
|
+ String sql = sqlFactory.getSQL();
|
|
|
// System.err.println(sqlFactory.getSQL());
|
|
|
Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
|
|
|
RowsMap attinfoRowsMap = getAttachmentUrl("tsupplyanddemand", rows.toArrayList("tsupplyanddemandid"));
|