|
@@ -45,6 +45,7 @@ public class WaterConsumptionController {
|
|
|
) {
|
|
|
log.debug("开始执行用水量汇总统计");
|
|
|
CommonQueryCondition condition = setConditionForQuery(customerId, provinces, cities, regions, communities, buildingIds, startDate, endDate, minConsumption, maxConsumption);
|
|
|
+ condition.setCustomerIds(UserUtil.getCustomerIds());
|
|
|
WaterConsumptionSummaryDto waterConsumptionSummaryDto = meterReadRecordService.waterConsumptionSummary(condition);
|
|
|
log.debug("结束执行用水量汇总统计");
|
|
|
return new AjaxMessage<>(ResultStatus.OK, waterConsumptionSummaryDto);
|
|
@@ -70,6 +71,7 @@ public class WaterConsumptionController {
|
|
|
log.debug("开始执行用水量列表统计");
|
|
|
CommonQueryCondition condition = setConditionForQuery(customerId, provinces, cities, regions, communities, buildingIds, startDate, endDate, minConsumption, maxConsumption);
|
|
|
condition.setSortOrder(sortOrder);
|
|
|
+ condition.setCustomerIds(UserUtil.getCustomerIds());
|
|
|
Pagination<WaterConsumptionDto> waterConsumptionDtoList = meterReadRecordService.getWaterConsumptionList(condition, pageNum, pageSize);
|
|
|
log.debug("结束执行用水量列表统计");
|
|
|
return new AjaxMessage<>(ResultStatus.OK, waterConsumptionDtoList);
|