|
|
@@ -793,7 +793,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<TOrderNewBo> list=(List<TOrderNewBo>) dunOrderNewList( name, orderNo, starTime, endTime,
|
|
|
specially, adminName, depId, pageNo, pageSize).getList();
|
|
|
- String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","结算状态","已收款","应收款","项目节点","项目状态","催收科目","催款启动时间"};
|
|
|
+ String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","结算状态","应收款","已收款","未收款","项目状态","催收科目","催款启动时间","签单时间"};
|
|
|
String fileName ="催款信息记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
|
|
|
//type 0 变更
|
|
|
XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"催款信息");
|
|
|
@@ -815,13 +815,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
case "订单状态": o = OrderNewState.getValueByCode(ob.getOrderStatus());break;
|
|
|
case "签单金额": o = ob.getTotalAmount().toString(); break;
|
|
|
case "结算状态": o = LiquidationNewState.getValueByCode(ob.getLiquidationStatus()); break;
|
|
|
+ case "应收款": o = ob.getAccountsReceivable().toString(); break;
|
|
|
case "已收款": o = ob.getSettlementAmount().toString(); break;
|
|
|
- case "应收款": o = ob.getAccountsReceivable(); break;
|
|
|
- case "项目节点": o = ob.getSalesmanName(); break;
|
|
|
+ case "未收款": o = ob.getUncollectedAmount().toString(); break;
|
|
|
case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
|
|
|
case "催收科目": o = OrderDunSubject.getValueByCode(Integer.valueOf(ob.getDunSubject())); break;
|
|
|
case "催款启动时间": o = ob.getStartDate(); break;
|
|
|
-
|
|
|
+ case "签单时间": o = ob.getSignDate(); break;
|
|
|
default: o = ""; break;
|
|
|
}
|
|
|
XSSFCell c = r.createCell(i);
|