|
|
@@ -108,13 +108,18 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 全国应收款统计
|
|
|
+ * 全国应收款统计
|
|
|
+ * @param depId
|
|
|
+ * @param depName
|
|
|
+ * @param startDate
|
|
|
+ * @param endDate
|
|
|
+ * @param sort 0按应收款 1按单量 2按金额
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectOrderDunAll",method = RequestMethod.GET)
|
|
|
- public Result selectOrderDunAll(String depId,String depName,String startDate ,String endDate){
|
|
|
+ public Result selectOrderDunAll(String depId,String depName,String startDate ,String endDate,Integer sort){
|
|
|
Result res = new Result();
|
|
|
- List<OutSelectOrderDunAll> list =newOrderDunService.selectOrderDunAll(depId,startDate,endDate);
|
|
|
+ List<OutSelectOrderDunAll> list =newOrderDunService.selectOrderDunAll(depId,startDate,endDate, sort);
|
|
|
res.data(list);
|
|
|
return res;
|
|
|
}
|
|
|
@@ -124,11 +129,17 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectOrderDunAllExprot",method = RequestMethod.GET)
|
|
|
- public Result selectOrderDunAllExprot(String depId,String depName,String startDate ,String endDate){
|
|
|
- List<OutSelectOrderDunAll> list=newOrderDunService.selectOrderDunAll(depId,startDate,endDate);
|
|
|
+ public Result selectOrderDunAllExprot(String depId,String depName,String startDate ,String endDate,Integer sort){
|
|
|
+ List<OutSelectOrderDunAll> list=newOrderDunService.selectOrderDunAll(depId,startDate,endDate, sort);
|
|
|
NewExcelUtil<OutSelectOrderDunAll> excelUtil=new NewExcelUtil<>(OutSelectOrderDunAll.class);
|
|
|
StringBuffer sb=new StringBuffer("搜索条件=》");
|
|
|
if (depName!=null)sb=sb.append("省份:").append(depName).append(",");
|
|
|
+ if (sort!=null){
|
|
|
+ sb=sb.append("排序:");
|
|
|
+ if (sort==0)sb=sb.append("排序:").append("按应收款").append(",");
|
|
|
+ if (sort==1)sb=sb.append("排序:").append("按单量").append(",");
|
|
|
+ if (sort==2)sb=sb.append("排序:").append("按金额").append(",");
|
|
|
+ }
|
|
|
if(startDate!=null&&endDate!=null)sb=sb.append("催收时间:").append(startDate).append("~").append(endDate).append(",");
|
|
|
return excelUtil.exportExcel(list,"签单统计表",uploadPath,sb.substring(0,sb.toString().length()-1));
|
|
|
}
|
|
|
@@ -156,7 +167,8 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
|
|
|
if (depName!=null)sb=sb.append("催收部门:").append(depName).append(",");
|
|
|
if (aName!=null)sb=sb.append("催款人:").append(aName).append(",");
|
|
|
if (sort!=null){
|
|
|
- if (sort==0)sb=sb.append("排序:").append("按签单金额").append(",");
|
|
|
+ sb=sb.append("排序:");
|
|
|
+ if (sort==0)sb=sb.append("排序:").append("按签单额").append(",");
|
|
|
if (sort==1)sb=sb.append("排序:").append("按应收款").append(",");
|
|
|
}
|
|
|
if(startDate!=null&&endDate!=null)sb=sb.append("催收时间:").append(startDate).append("~").append(endDate).append(",");
|