|
@@ -82,13 +82,17 @@ public class StatisticalReportController extends BaseRESTfulController {
|
|
String endTime,
|
|
String endTime,
|
|
String carrierSsoId,
|
|
String carrierSsoId,
|
|
Integer orderType,
|
|
Integer orderType,
|
|
- Integer shipperId
|
|
|
|
|
|
+ Integer shipperId,
|
|
|
|
+ String receivName
|
|
){
|
|
){
|
|
if(carrierSsoId != null){
|
|
if(carrierSsoId != null){
|
|
if(!"null".equals(carrierSsoId)){
|
|
if(!"null".equals(carrierSsoId)){
|
|
mapValue.put("carrierSsoId", carrierSsoId);
|
|
mapValue.put("carrierSsoId", carrierSsoId);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if (receivName != null && !"null".equals(receivName)) {
|
|
|
|
+ mapValue.put("receivName","%" + receivName + "%");
|
|
|
|
+ }
|
|
mapValue.put("orderType",orderType);
|
|
mapValue.put("orderType",orderType);
|
|
mapValue.put("shipperId",shipperId);
|
|
mapValue.put("shipperId",shipperId);
|
|
DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
|
|
DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
|