|
@@ -812,21 +812,21 @@ public class TongbuServiceImpl implements TongbuService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public McR query(String formUuid, Map conditions, Map argument,int currentPage) {
|
|
|
|
- List<Map> data = (List<Map>) ydClient.queryData(YDParam.builder()
|
|
|
|
|
|
+ public McR query(String formUuid, Map conditions, Map argument,int currentPage,int pageSize) {
|
|
|
|
+ DDR_New ddrNew = ydClient.queryData(YDParam.builder()
|
|
.formUuid(formUuid)
|
|
.formUuid(formUuid)
|
|
.searchFieldJson(JSONObject.toJSONString(conditions))
|
|
.searchFieldJson(JSONObject.toJSONString(conditions))
|
|
.instanceStatus(UtilMap.getString(argument, "instanceStatus"))
|
|
.instanceStatus(UtilMap.getString(argument, "instanceStatus"))
|
|
.approvedResult(UtilMap.getString(argument, "approvedResult"))
|
|
.approvedResult(UtilMap.getString(argument, "approvedResult"))
|
|
- .createFromTimeGMT(UtilMap.getString(argument,"createFrom"))
|
|
|
|
|
|
+ .createFromTimeGMT(UtilMap.getString(argument, "createFrom"))
|
|
.currentPage(currentPage)
|
|
.currentPage(currentPage)
|
|
- .pageSize(100)
|
|
|
|
|
|
+ .pageSize(pageSize)
|
|
.appType("APP_E0BKS4I6U44824QM1KE5")
|
|
.appType("APP_E0BKS4I6U44824QM1KE5")
|
|
.systemToken("U0E66VB1J86UR5RKDPXQTA7WM66K3896KHW8MS5")
|
|
.systemToken("U0E66VB1J86UR5RKDPXQTA7WM66K3896KHW8MS5")
|
|
.userId("253434204020308091")//任欢欢
|
|
.userId("253434204020308091")//任欢欢
|
|
- .build(), YDConf.FORM_QUERY.retrieve_search_process).getData();
|
|
|
|
|
|
+ .build(), YDConf.FORM_QUERY.retrieve_search_process);
|
|
|
|
|
|
|
|
|
|
- return McR.success(data);
|
|
|
|
|
|
+ return McR.success(ddrNew);
|
|
}
|
|
}
|
|
}
|
|
}
|