|
|
@@ -570,19 +570,17 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public void exportMyBill(HttpServletResponse response, String orderNo,Integer whoType, Integer pageSize, Integer pageNo)throws Exception {
|
|
|
+ public void exportMyBill(HttpServletResponse response, TOrderBillNew billNew,Integer whoType, Integer pageSize, Integer pageNo)throws Exception {
|
|
|
|
|
|
OutputStream out = response.getOutputStream();
|
|
|
if(pageSize==null||pageSize<0)pageSize=9999;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
- TOrderBillNew billNew=new TOrderBillNew();
|
|
|
- billNew.setOrderNo(orderNo);
|
|
|
+
|
|
|
List<TOrderBillNew>list=(List<TOrderBillNew>) orderBillService.myBillList(billNew, whoType,pageNo, pageSize).getList();
|
|
|
try {
|
|
|
//设计表头
|
|
|
- if(orderNo==null)orderNo="";
|
|
|
String[] comment = {"订单编号","合同编号","收款时间","财务流水时间","财务流水号","金额(万元)","收款方","付款方","流水科目","平台流水号","收款类型","备注"};
|
|
|
- String fileName = orderNo+"流水记录列表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
|
|
|
+ String fileName = (billNew.getOrderNo()==null?"":billNew.getOrderNo())+"流水记录列表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
|
|
|
//type 0 收款 1开票 2流水
|
|
|
XSSFWorkbook wb =exportTemplateInfoS(comment,"流水记录",list,2);
|
|
|
//根据列表编写文档
|