From 92eaa65140db80347f447252abee58dc41e23d9e Mon Sep 17 00:00:00 2001
From: llw <18235445130@163.com>
Date: Mon, 14 Aug 2017 15:15:21 +0800
Subject: [PATCH] 提交

---
 src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java
index 3af4587..c442285 100644
--- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java
+++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java
@@ -242,10 +242,10 @@ public class MonthBillManagementController extends BizController {
 //		}
 		billQueryRequest.setParkIdList(plNos);
 		logger.info("月账单管理对账单统计明细 req={}", JSONObject.toJSONString(billQueryRequest));
-		BizResult<List<BillManageForMonthDetailDTO>> respondResult = monthBillManagementService
+		BizResult<PageBean<BillManageForMonthDetailDTO>> respondResult = monthBillManagementService
 				.queryBillforMonthDetail(billQueryRequest);
 		logger.info("月账单管理对账单统计明细 respondResult={}", JSONObject.toJSONString(respondResult));
-		return returnJqGridDataByList(respondResult, BillManageForMonthDetailDTO.class);
+		return returnJqGridData(respondResult, BillManageForMonthDetailDTO.class);
 	}
 
 	/**
@@ -456,7 +456,7 @@ public class MonthBillManagementController extends BizController {
 	public void exportToExcleForBillForAll(
 			@RequestParam String beginTime,
 			@RequestParam String endTime, HttpServletRequest request, HttpServletResponse response) {
-		BizResult<List<BillManageForMonthDetailDTO>> respondResult= new BizResult<List<BillManageForMonthDetailDTO>>();
+		BizResult<PageBean<BillManageForMonthDetailDTO>> respondResult= new BizResult<PageBean<BillManageForMonthDetailDTO>>();
 		try {
 			BillQueryRequest billQueryRequest=new BillQueryRequest();
 			if (null == beginTime || null == endTime) {
@@ -503,8 +503,8 @@ public class MonthBillManagementController extends BizController {
 			List<Object[]> contentYearOrMonthList = new ArrayList<Object[]>();
 			List<Object[]> contentTmpList = new ArrayList<Object[]>();
 			List<BillManageForMonthDetailDTO> list = new ArrayList<BillManageForMonthDetailDTO>();
-			if (CollectionUtils.isNotEmpty(respondResult.getData())) {
-				list = respondResult.getData();
+			if (CollectionUtils.isNotEmpty(respondResult.getData().getDataList())) {
+				list = respondResult.getData().getDataList();
 			}
 			for (BillManageForMonthDetailDTO e : list) {
 				Object[] obj = new Object[title.length];
--
libgit2 0.21.4