|
|
@@ -21,16 +21,16 @@ public class OrderStatisticsServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
|
|
|
@Override
|
|
|
public Object orderSalesSource(InputOrderSalesSource in) {
|
|
|
- if (in.getSort()==null)in.setSort(0);
|
|
|
+ if (in.getSort()==null)in.setSort(1);
|
|
|
if(in.getEndDate()!=null)in.setEndDate(in.getEndDate()+" 23:59:59");
|
|
|
if (in.getDeps()!=null){
|
|
|
List<String> ls= JSON.parseArray(in.getDeps(),String.class);
|
|
|
in.setListDep(ls);
|
|
|
}
|
|
|
- if (in.getSort()==0){
|
|
|
+ if (in.getSort()==1){
|
|
|
List<OutOrderSalesSource> outOrderSalesSources = tOrderNewMapper.orderSalesSource(in);
|
|
|
return outOrderSalesSources;
|
|
|
- }else if (in.getSort()==1){
|
|
|
+ }else if (in.getSort()==0){
|
|
|
List<OutOrderSalesSourceAmount> outOrderSalesSources = tOrderNewMapper.orderSalesSourceAmount(in);
|
|
|
return outOrderSalesSources;
|
|
|
}
|