Commit 71aba268ec376a2f367ecbdff8fd8b4ece6666a5
1 parent
8a73bc9c
提交
Showing
1 changed file
with
4 additions
and
4 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/YearMonthCardStatisticController.java
... | ... | @@ -101,7 +101,7 @@ public class YearMonthCardStatisticController extends BizController { |
101 | 101 | @ApiOperation("导出年卡月卡统计excel") |
102 | 102 | @GetMapping("exportYearMonthStatisticExcel") |
103 | 103 | public void exportYearMonthStatisticExcel(@RequestParam Long beginTime, @RequestParam Long endTime, |
104 | - @RequestParam List<String> plNos, @RequestParam String parkNames, | |
104 | + @RequestParam List<String> plNos, | |
105 | 105 | Integer orderType, Integer dataState, |
106 | 106 | HttpServletRequest requests, HttpServletResponse response) throws Exception { |
107 | 107 | |
... | ... | @@ -117,8 +117,8 @@ public class YearMonthCardStatisticController extends BizController { |
117 | 117 | |
118 | 118 | BizResult<PageBean<YearMonthCardStatisticDTO>> bizResult = yearMonthCardStatisticService |
119 | 119 | .queryYearMonthCardStatistic(request); |
120 | - BizResult<List<YearMonthCardStatisticSumDTO>> bizResultSum = yearMonthCardStatisticService | |
121 | - .queryYearMonthCardStatisticSum(request); | |
120 | +// BizResult<List<YearMonthCardStatisticSumDTO>> bizResultSum = yearMonthCardStatisticService | |
121 | +// .queryYearMonthCardStatisticSum(request); | |
122 | 122 | |
123 | 123 | SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
124 | 124 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
... | ... | @@ -200,7 +200,7 @@ public class YearMonthCardStatisticController extends BizController { |
200 | 200 | obj[index++] = e.getCarNumber(); |
201 | 201 | obj[index++] = e.getParkName(); |
202 | 202 | obj[index++] = StringUtils.isEmpty(e.getCustName())?"":e.getCustName(); |
203 | - obj[index++] = StringUtils.isEmpty(e.getParkName())?"":e.getParkName(); | |
203 | + obj[index++] = StringUtils.isEmpty(e.getUserPhone())?"":e.getUserPhone(); | |
204 | 204 | |
205 | 205 | obj[index++] = e.getAmount() != null ? e.getAmount() : "0.00"; |
206 | 206 | obj[index++] = e.getEffDate() != null ? format.format(e.getEffDate()) | ... | ... |