|
|
@@ -420,19 +420,23 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
}
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public void exportTemplate(HttpServletResponse response,OrderListBo order) throws Exception {
|
|
|
+ public void exportTemplate(HttpServletResponse response,OrderListBo order, Integer pageSize, Integer pageNo) throws Exception {
|
|
|
OutputStream out = response.getOutputStream();
|
|
|
- //财务专员自己的id
|
|
|
+ // 财务专员自己的id
|
|
|
order.setFinanceId(TokenManager.getAdminId());
|
|
|
//order.setProcessStatus(3);//分配给自己 改为前端 传3未分配 4已分配
|
|
|
order.setOrderStatus(2);//营销管理员审核通过
|
|
|
- List<OrderListBo> list=(List<OrderListBo>) fundManageOrderService.financeList(order, 1, 9999).getList();
|
|
|
+ if(pageSize==null||pageSize<0)pageSize=9999;
|
|
|
+ if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
+ List<OrderListBo> list=(List<OrderListBo>) fundManageOrderService.financeList(order, pageNo, pageSize).getList();
|
|
|
try {
|
|
|
//设计表头
|
|
|
String[] comment = {"订单编号", "合同编号","客户名称","订单部门","订单负责人","签单日期","下单日期",
|
|
|
- "签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","最近收款(万元)","结算状态","订单流程","是否特批"};
|
|
|
+ "签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","最近收款(万元)","最近收款时间","结算状态","订单流程","是否特批"};
|
|
|
String fileName = "收款结算列表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
|
|
|
XSSFWorkbook wb =exportTemplateInfoS(comment,"收款结算",list);
|
|
|
+ //根据列表编写文档
|
|
|
+
|
|
|
//返回名称及参数
|
|
|
response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes(),"iso-8859-1"));
|
|
|
response.setContentType("application/octet-stream;charset=utf-8");
|
|
|
@@ -477,9 +481,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
c.setCellValue(comment[i]);
|
|
|
c.setCellStyle(style2);
|
|
|
}
|
|
|
- //根据列表编写文档
|
|
|
addSettlementReceivablesList(comment, list, sheet);
|
|
|
-
|
|
|
return wb;
|
|
|
}
|
|
|
private static void addSettlementReceivablesList(String[] comment, List<OrderListBo> list, XSSFSheet sheet) {
|
|
|
@@ -500,9 +502,10 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
case "签单日期": o = ob.getSignTime(); break;
|
|
|
case "下单日期": o = ob.getCreateTime(); break;
|
|
|
case "签单金额(万元)":o=ob.getSignTotalAmount();break;
|
|
|
- case "已开票金额(万元)":o="";break;
|
|
|
+ case "已开票金额(万元)":o=ob.getInvoiceAmount();break;
|
|
|
case "已收金额(万元)":o=ob.getActuallyTotalAmount();break;
|
|
|
- case "最近收款(万元)":o="";break;
|
|
|
+ case "最近收款(万元)":o=ob.getFinalReceivables();break;
|
|
|
+ case "最近收款时间":o=ob.getFinalReceivablesTime();break;
|
|
|
case "结算状态":o=LiquidationNewState.getValueByCode(ob.getLiquidationStatus());break;
|
|
|
case "订单流程":o=ProcessStatus.getValueByCode(ob.getProcessStatus());break;
|
|
|
case "是否特批":o=ApprovalNewState.getValueByCode(ob.getApproval());break;
|