BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 92eaa65140db80347f447252abee58dc41e23d9e

Authored by llw
1 parent 8b3c55b3

提交

Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java
  View file @92eaa65
... ... @@ -242,10 +242,10 @@ public class MonthBillManagementController extends BizController {
242 242 // }
243 243 billQueryRequest.setParkIdList(plNos);
244 244 logger.info("月账单管理对账单统计明细 req={}", JSONObject.toJSONString(billQueryRequest));
245   - BizResult<List<BillManageForMonthDetailDTO>> respondResult = monthBillManagementService
  245 + BizResult<PageBean<BillManageForMonthDetailDTO>> respondResult = monthBillManagementService
246 246 .queryBillforMonthDetail(billQueryRequest);
247 247 logger.info("月账单管理对账单统计明细 respondResult={}", JSONObject.toJSONString(respondResult));
248   - return returnJqGridDataByList(respondResult, BillManageForMonthDetailDTO.class);
  248 + return returnJqGridData(respondResult, BillManageForMonthDetailDTO.class);
249 249 }
250 250  
251 251 /**
... ... @@ -456,7 +456,7 @@ public class MonthBillManagementController extends BizController {
456 456 public void exportToExcleForBillForAll(
457 457 @RequestParam String beginTime,
458 458 @RequestParam String endTime, HttpServletRequest request, HttpServletResponse response) {
459   - BizResult<List<BillManageForMonthDetailDTO>> respondResult= new BizResult<List<BillManageForMonthDetailDTO>>();
  459 + BizResult<PageBean<BillManageForMonthDetailDTO>> respondResult= new BizResult<PageBean<BillManageForMonthDetailDTO>>();
460 460 try {
461 461 BillQueryRequest billQueryRequest=new BillQueryRequest();
462 462 if (null == beginTime || null == endTime) {
... ... @@ -503,8 +503,8 @@ public class MonthBillManagementController extends BizController {
503 503 List<Object[]> contentYearOrMonthList = new ArrayList<Object[]>();
504 504 List<Object[]> contentTmpList = new ArrayList<Object[]>();
505 505 List<BillManageForMonthDetailDTO> list = new ArrayList<BillManageForMonthDetailDTO>();
506   - if (CollectionUtils.isNotEmpty(respondResult.getData())) {
507   - list = respondResult.getData();
  506 + if (CollectionUtils.isNotEmpty(respondResult.getData().getDataList())) {
  507 + list = respondResult.getData().getDataList();
508 508 }
509 509 for (BillManageForMonthDetailDTO e : list) {
510 510 Object[] obj = new Object[title.length];
... ...