|
|
@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
@@ -55,6 +56,8 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
|
|
|
private OrderInvoiceService orderInvoiceService;
|
|
|
@Resource
|
|
|
private FundManageOrderService fundManageOrderService;
|
|
|
+ @Value(value = "${upload.path}")
|
|
|
+ private String uploadPath = null;
|
|
|
/**
|
|
|
* 新增预计回款信息
|
|
|
* @param t
|
|
|
@@ -202,11 +205,10 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
|
|
|
/**
|
|
|
* 导出回款
|
|
|
*
|
|
|
- * @param response
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/exportReceivables" , method = RequestMethod.GET)
|
|
|
- public Result exportReceivables(HttpServletResponse response,OrderListBo o,Integer pageSize ,Integer pageNo) {
|
|
|
+ public Result exportReceivables(OrderListBo o,Integer pageSize ,Integer pageNo) {
|
|
|
if (pageSize==null)pageSize=99999;
|
|
|
o.setOrderStatus(2);//营销管理员审核通过
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@@ -214,7 +216,7 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<OrderListBo> list=(List<OrderListBo>)p.getList() ;
|
|
|
NewExcelUtil<OrderListBo>excel=new NewExcelUtil<>(OrderListBo.class);
|
|
|
- return excel.exportExcel(list,"订单回款列表",response);
|
|
|
+ return excel.exportExcel(list,"订单回款列表",uploadPath);
|
|
|
}
|
|
|
|
|
|
/**
|