|
|
@@ -642,14 +642,18 @@ public class AdminNewOrderApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/statisticsList", method = RequestMethod.GET)
|
|
|
public Result statisticsList(InputStatistics in){
|
|
|
List<OutStatisticsList> result = orderNewService.statisticsList(in);
|
|
|
- if (in.getSort()==null||in.getSort()==0){
|
|
|
+ ListSort(result,in.getSort());
|
|
|
+ return res().data(result);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void ListSort(List<OutStatisticsList> result,Integer sort) {
|
|
|
+ if (sort==null||sort==0){
|
|
|
result.sort(Comparator.comparing(OutStatisticsList::getTotal).reversed());
|
|
|
- }else if (in.getSort()==1){
|
|
|
+ }else if (sort==1){
|
|
|
result.sort(Comparator.comparing(OutStatisticsList::getQuantity).reversed());
|
|
|
} else {
|
|
|
result.sort(Comparator.comparing(OutStatisticsList::getCounts).reversed());
|
|
|
}
|
|
|
- return res().data(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -659,6 +663,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/statisticsListExprot", method = RequestMethod.GET)
|
|
|
public Result statisticsListExprot(InputStatistics in){
|
|
|
List<OutStatisticsList> list =orderNewService.statisticsList(in);
|
|
|
+ ListSort(list,in.getSort());
|
|
|
NewExcelUtil<OutStatisticsList> excelUtil=new NewExcelUtil<>(OutStatisticsList.class);
|
|
|
StringBuffer sb=new StringBuffer("搜索条件=》");
|
|
|
if (in.getDepName()!=null)sb=sb.append("部门:").append(in.getDepName()).append(",");
|
|
|
@@ -682,12 +687,22 @@ public class AdminNewOrderApiController extends CertifyApiController {
|
|
|
/**
|
|
|
* 省份签单统计表
|
|
|
* a.total_amount>0.5,1,if(a.total_amount>0 and a.order_type=1,0.5,0)
|
|
|
- * 签单金额大于1万计做一个订单,小于0.5,如果是科技项目计做0.5单,其他计算成0单
|
|
|
+ * 签单金额大于0.5万计做一个订单,小于0.5,如果是科技项目计做0.5单,其他计算成0单
|
|
|
* @throws IOException
|
|
|
*/
|
|
|
@RequestMapping(value = "/provinceStatisticsList", method = RequestMethod.GET)
|
|
|
public Result provinceStatisticsList(InputStatistics in){
|
|
|
- return res().data(orderNewService.provinceStatisticsList(in));
|
|
|
+ List<OutProvinceStatisticsList> out = orderNewService.provinceStatisticsList(in);
|
|
|
+ ProvinceListSort(out,in.getSort());
|
|
|
+ return res().data(out);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void ProvinceListSort(List<OutProvinceStatisticsList> out, Integer sort) {
|
|
|
+ if (sort==null||sort==0){
|
|
|
+ out.sort(Comparator.comparing(OutProvinceStatisticsList::getTotal).reversed());
|
|
|
+ }else if (sort==1){
|
|
|
+ out.sort(Comparator.comparing(OutProvinceStatisticsList::getQuantity).reversed());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -696,8 +711,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/provinceStatisticsListExprot", method = RequestMethod.GET)
|
|
|
public Result provinceStatisticsListExprot(InputStatistics in){
|
|
|
- List<outProvinceStatisticsList> list =orderNewService.provinceStatisticsList(in);
|
|
|
- NewExcelUtil<outProvinceStatisticsList> excelUtil=new NewExcelUtil<>(outProvinceStatisticsList.class);
|
|
|
+ List<OutProvinceStatisticsList> list =orderNewService.provinceStatisticsList(in);
|
|
|
+ ProvinceListSort(list,in.getSort());
|
|
|
+ NewExcelUtil<OutProvinceStatisticsList> excelUtil=new NewExcelUtil<>(OutProvinceStatisticsList.class);
|
|
|
StringBuffer sb=new StringBuffer("搜索条件=》");
|
|
|
if (in.getDepName()!=null)sb=sb.append("部门:").append(in.getDepName()).append(",");
|
|
|
if(in.getProvinceName()!=null)sb=sb.append("省份:").append(in.getProvinceName()).append(",");
|