|
@@ -267,6 +267,7 @@ public class ServiceController {
|
|
public Object newCustomerTradeDetail(
|
|
public Object newCustomerTradeDetail(
|
|
@RequestParam(required = true) String startTime,
|
|
@RequestParam(required = true) String startTime,
|
|
@RequestParam(required = false) String city,
|
|
@RequestParam(required = false) String city,
|
|
|
|
+ @RequestParam(required = false) String mobile,
|
|
@RequestParam(required = false) String type,//保洁、品类
|
|
@RequestParam(required = false) String type,//保洁、品类
|
|
@RequestParam(defaultValue = "1") Integer pageIndex,
|
|
@RequestParam(defaultValue = "1") Integer pageIndex,
|
|
@RequestParam(defaultValue = "50") Integer pageSize,
|
|
@RequestParam(defaultValue = "50") Integer pageSize,
|
|
@@ -281,6 +282,7 @@ public class ServiceController {
|
|
DayReportBaseVo vo = new DayReportBaseVo();
|
|
DayReportBaseVo vo = new DayReportBaseVo();
|
|
vo.setCity(city);
|
|
vo.setCity(city);
|
|
vo.setStartTime(startTime);
|
|
vo.setStartTime(startTime);
|
|
|
|
+ vo.setMobile(mobile);
|
|
if(isExport){
|
|
if(isExport){
|
|
vo.setStartPage(1);
|
|
vo.setStartPage(1);
|
|
vo.setLimit(40000);
|
|
vo.setLimit(40000);
|
|
@@ -313,6 +315,7 @@ public class ServiceController {
|
|
public Object cycleTradeDetail(
|
|
public Object cycleTradeDetail(
|
|
@RequestParam(required = true) String startTime,
|
|
@RequestParam(required = true) String startTime,
|
|
@RequestParam(required = false) String city,
|
|
@RequestParam(required = false) String city,
|
|
|
|
+ @RequestParam(required = false) String mobile,
|
|
@RequestParam(defaultValue = "1") Integer pageIndex,
|
|
@RequestParam(defaultValue = "1") Integer pageIndex,
|
|
@RequestParam(defaultValue = "50") Integer pageSize,
|
|
@RequestParam(defaultValue = "50") Integer pageSize,
|
|
@RequestParam(defaultValue = "false") Boolean isExport,
|
|
@RequestParam(defaultValue = "false") Boolean isExport,
|
|
@@ -322,6 +325,7 @@ public class ServiceController {
|
|
}
|
|
}
|
|
DayReportBaseVo vo = new DayReportBaseVo();
|
|
DayReportBaseVo vo = new DayReportBaseVo();
|
|
vo.setCity(city);
|
|
vo.setCity(city);
|
|
|
|
+ vo.setMobile(mobile);
|
|
vo.setStartTime(startTime);
|
|
vo.setStartTime(startTime);
|
|
if (isExport) {
|
|
if (isExport) {
|
|
vo.setStartPage(1);
|
|
vo.setStartPage(1);
|