|
@@ -108,6 +108,11 @@ public class StatisticalReportController extends BaseRESTfulController {
|
|
|
}
|
|
|
mapValue.put("orderTypee",orderType);
|
|
|
mapValue.put("shipperId",shipperId);
|
|
|
+ if(orderType==1 && mapValue.get("orderField")==null){
|
|
|
+ //如果没有使用排序且查询的表格类型为销售钢材内部专用表格,默认规格排序
|
|
|
+ mapValue.put("orderField","materialCode");
|
|
|
+ mapValue.put("orderType","desc");
|
|
|
+ }
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
//分页数据
|
|
|
List<Map<String, Object>> report = statisticalReportService.getAllSaleReport(mapValue);
|