BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 71aba268ec376a2f367ecbdff8fd8b4ece6666a5

Authored by llw
1 parent 8a73bc9c

提交

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