jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 7 additions and 12 deletions

...	...	@@ -356,16 +356,6 @@
356	356	return antExRecordDao.queryRecord(query.addOrder(direction, sortField));
357	357	}
358	358
359		- public List<AntExRecordModel> queryAntExRecords(AntExRecordQuery antExRecordQuery,Sort.Direction direction,String sortField,int count) {
360		- MongoQuery query = antExRecordQuery.convertToQuery();
361		- if (StringUtils.isNotEmpty(antExRecordQuery.getNeed())) {
362		- antExRecordQuery.mysqlBuild(count);
363		- query.start(antExRecordQuery.getOffset()).end(antExRecordQuery.getLimit());
364		- }
365		- return antExRecordDao.queryRecord(query.addOrder(direction, sortField));
366		- }
367		-
368		-
369	359	public Integer count(AntExRecordQuery antExRecordQuery) {
370	360	return antExRecordDao.count(antExRecordQuery.convertToQuery());
371	361	}

1	1	package com.lyms.platform.operate.web.facade;
2	2
3	3	import com.lyms.platform.biz.service.*;
	4	+import com.lyms.platform.common.base.PageInfo;
4	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	6	import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
6	7	import com.lyms.platform.common.enums.YnEnums;
...	...	@@ -800,7 +801,7 @@
800	801	riskBasicMap.clear();
801	802
802	803	}
803		-
	804	+ System.out.println("ids ============ " + ids.size());
804	805	if (CollectionUtils.isEmpty(ids))
805	806	{
806	807	return null;
807	808
...	...	@@ -839,11 +840,15 @@
839	840	}
840	841
841	842	pageAntExRecordsQuery.setNeed("true");
	843	+ pageAntExRecordsQuery.setPage(request.getPage());
	844	+ pageAntExRecordsQuery.setLimit(request.getLimit());
842	845	pageAntExRecordsQuery.setIds(recordIds);
843	846	pageAntExRecordsQuery.setLevelId(request.getLevel());
844	847	System.out.println("ids = " + ids.size());
845	848
846		- List<AntExRecordModel> pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery, Sort.Direction.DESC, "checkTime",ids.size());
	849	+ pageAntExRecordsQuery.mysqlBuild(ids.size());
	850	+
	851	+ List<AntExRecordModel> pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery);
847	852	if (CollectionUtils.isNotEmpty(pageAntExRecords))
848	853	{
849	854	for (AntExRecordModel model : pageAntExRecords)