From 71aba268ec376a2f367ecbdff8fd8b4ece6666a5 Mon Sep 17 00:00:00 2001
From: llw <18235445130@163.com>
Date: Thu, 24 Aug 2017 11:22:19 +0800
Subject: [PATCH] 提交

---
 src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/YearMonthCardStatisticController.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/YearMonthCardStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/YearMonthCardStatisticController.java
index 465e4b2..aa95c7e 100644
--- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/YearMonthCardStatisticController.java
+++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/YearMonthCardStatisticController.java
@@ -101,7 +101,7 @@ public class YearMonthCardStatisticController extends BizController {
     @ApiOperation("导出年卡月卡统计excel")
     @GetMapping("exportYearMonthStatisticExcel")
     public void exportYearMonthStatisticExcel(@RequestParam Long beginTime, @RequestParam Long endTime,
-        @RequestParam List<String> plNos, @RequestParam String parkNames,
+        @RequestParam List<String> plNos, 
         Integer orderType,  Integer dataState,
         HttpServletRequest requests, HttpServletResponse response) throws Exception {
 
@@ -117,8 +117,8 @@ public class YearMonthCardStatisticController extends BizController {
 
         BizResult<PageBean<YearMonthCardStatisticDTO>> bizResult = yearMonthCardStatisticService
             .queryYearMonthCardStatistic(request);
-        BizResult<List<YearMonthCardStatisticSumDTO>> bizResultSum = yearMonthCardStatisticService
-            .queryYearMonthCardStatisticSum(request);
+//        BizResult<List<YearMonthCardStatisticSumDTO>> bizResultSum = yearMonthCardStatisticService
+//            .queryYearMonthCardStatisticSum(request);
 
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
@@ -200,7 +200,7 @@ public class YearMonthCardStatisticController extends BizController {
             obj[index++] = e.getCarNumber();
             obj[index++] = e.getParkName();
             obj[index++] = StringUtils.isEmpty(e.getCustName())?"":e.getCustName();
-            obj[index++] = StringUtils.isEmpty(e.getParkName())?"":e.getParkName();
+            obj[index++] = StringUtils.isEmpty(e.getUserPhone())?"":e.getUserPhone();
             
             obj[index++] = e.getAmount() != null ? e.getAmount() : "0.00";
             obj[index++] = e.getEffDate() != null ? format.format(e.getEffDate())
--
libgit2 0.21.4