|
|
@@ -984,7 +984,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
/**
|
|
|
* 将合同编号置为闲置编号
|
|
|
* @param orderNo
|
|
|
- * @param t
|
|
|
*/
|
|
|
private void contractNoReplace(String orderNo, String contractNo,String orderDep) {
|
|
|
Calendar c=Calendar.getInstance();
|
|
|
@@ -1075,13 +1074,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
List<outOrderDunListBo> list=(List<outOrderDunListBo>) dunOrderNewList( name, orderNo, starTime, endTime,
|
|
|
specially, adminName, depId,newStatus, 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,"催款信息");
|
|
|
//根据列表编写文档
|
|
|
XSSFSheet sheet =wb.getSheetAt(0);
|
|
|
- System.out.println(list.get(0).getAccountsReceivable());
|
|
|
for (outOrderDunListBo ob : list) {
|
|
|
//新增一行
|
|
|
XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
|
|
|
@@ -1091,16 +1089,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
switch (comment[i]) {
|
|
|
// "合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","项目负责人","签单金额","结算状态","已收款","应收款","项目状态","催收科目","催款启动时间"
|
|
|
case "合同编号": o = ob.getContractNo(); break;
|
|
|
- case "订单编号": o = ob.getOrderNo().toString(); break;
|
|
|
+ case "订单编号": o = ob.getOrderNo(); break;
|
|
|
case "客户名称": o = ob.getUserName(); break;
|
|
|
case "订单负责人": o = ob.getSalesmanName(); break;
|
|
|
case "订单部门": o = ob.getDepName(); break;
|
|
|
case "订单状态": o = OrderNewState.getValueByCode(ob.getOrderStatus());break;
|
|
|
case "签单金额": o = ob.getTotalAmount().toString(); break;
|
|
|
+ case "已收款": o = bigToString(ob.getSettlementAmount()); break;
|
|
|
+ case "未收款": o = bigToString(ob.getUncollectedAmount()); break;
|
|
|
+ case "拨款比例": o = bigToString(ob.getAppropriationRatio()); break;
|
|
|
case "结算状态": o = LiquidationNewState.getValueByCode(ob.getLiquidationStatus()); break;
|
|
|
- case "应收款": o = ob.getAccountsReceivable().toString(); break;
|
|
|
- case "已收款": o = ob.getSettlementAmount().toString(); break;
|
|
|
- case "未收款": o = ob.getUncollectedAmount().toString(); break;
|
|
|
+ case "应收款": o = bigToString(ob.getAccountsReceivable()); break;
|
|
|
case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
|
|
|
case "催收科目": o = ob.getDunSubject(); break;
|
|
|
case "催款状态": o = ob.getDunStatus()==0?"未启动":"已启动"; break;
|
|
|
@@ -1120,6 +1119,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
out.flush();
|
|
|
out.close();
|
|
|
} catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
throw new BusinessException(new Error("表格生成错误。"));
|
|
|
}finally {
|
|
|
out.flush();
|
|
|
@@ -1128,6 +1128,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
}
|
|
|
|
|
|
+ private String bigToString (BigDecimal o){
|
|
|
+ if(o==null){return "";}
|
|
|
+ else{
|
|
|
+ return o.stripTrailingZeros().toEngineeringString();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
|
|
|
@Override
|