Commit 74d8158f authored by KeYong's avatar KeYong

更新

parent 01ac7df5
...@@ -119,7 +119,7 @@ public class DutyCarController extends BaseController { ...@@ -119,7 +119,7 @@ public class DutyCarController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "车辆执勤导出", notes = "车辆执勤导出") @ApiOperation(httpMethod = "GET", value = "车辆执勤导出", notes = "车辆执勤导出")
public ResponseModel exportExcel(HttpServletResponse response, @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate, public ResponseModel exportExcel(HttpServletResponse response, @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
@ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException { @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
return ResponseHelper.buildResponse(iDutyCarService.downloadList(beginDate, endDate, response)); return ResponseHelper.buildResponse(iDutyCarService.downloadList(beginDate, endDate));
} }
/** /**
......
...@@ -48,7 +48,7 @@ public interface IDutyCommonService { ...@@ -48,7 +48,7 @@ public interface IDutyCommonService {
*/ */
String getGroupCode(); String getGroupCode();
List<DutyCarDto> downloadList(String beginDate, String endDate, HttpServletResponse response) throws ParseException; List<DutyCarDto> downloadList(String beginDate, String endDate) throws ParseException;
/** /**
* 值班数据入库 * 值班数据入库
......
...@@ -179,7 +179,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService { ...@@ -179,7 +179,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
} }
@Override @Override
public List downloadList(String beginDate, String endDate, HttpServletResponse response) throws ParseException { public List downloadList(String beginDate, String endDate) throws ParseException {
List<Map<String, Object>> maps = this.list(beginDate, endDate); List<Map<String, Object>> maps = this.list(beginDate, endDate);
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
jsonArray.addAll(maps); jsonArray.addAll(maps);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment