|
|
@@ -437,15 +437,9 @@ public class EsignContractTaskMX extends Controller {
|
|
|
querySQL.setSiteid(siteid);
|
|
|
querySQL.setWhere("t4.sys_enterpriseid", sys_enterpriseid);
|
|
|
querySQL.setPage(pageSize, pageNumber);
|
|
|
+ querySQL.setOrderBy("t1.createdate desc");
|
|
|
Rows rows = querySQL.query();
|
|
|
|
|
|
- for (Row row : rows) {
|
|
|
- String flowid = row.getString("flowid");
|
|
|
- if (!StringUtils.isBlank(flowid)) {
|
|
|
- row.put("downloadurl", WeChatContractUtil.describeFileUrls(flowid));
|
|
|
- }
|
|
|
- row.putIfAbsent("downloadurl", "");
|
|
|
- }
|
|
|
|
|
|
return getSucReturnObject().setData(rows).toString();
|
|
|
}
|
|
|
@@ -471,11 +465,6 @@ public class EsignContractTaskMX extends Controller {
|
|
|
|
|
|
RowsMap attachmentsMap = Attachment.get(this, "sa_esign_contract_taskmx", rows.toArrayList("sa_esign_contract_taskmxid", new ArrayList<>()));
|
|
|
for (Row row : rows) {
|
|
|
- String flowid = row.getString("flowid");
|
|
|
- if (!StringUtils.isBlank(flowid)) {
|
|
|
- row.put("downloadurl", WeChatContractUtil.describeFileUrls(flowid));
|
|
|
- }
|
|
|
- row.putIfAbsent("downloadurl", "");
|
|
|
Long sa_esign_contract_taskmxid = row.getLong("sa_esign_contract_taskmxid");
|
|
|
row.put("attinfos", attachmentsMap.getOrDefault(sa_esign_contract_taskmxid, new Rows()));
|
|
|
}
|