1111

code/finance_serv/src/main/java/com/vion/financial/excel/ExportModel.java

@@ -51,11 +51,11 @@ public class ExportModel {
 	private Integer over_days;                            //逾期天数
 	private Integer over_days;                            //逾期天数
 	@Excel(name="预付款金额")
 	@Excel(name="预付款金额")
 	private Double advance_pay;                           //预付款金额
 	private Double advance_pay;                           //预付款金额
-	@Excel(name="预付款到期日")
+	@Excel(name="预付款到期日",format="yyyy-MM-dd")
 	private Date advance_pay_date;                        //预付款到期日
 	private Date advance_pay_date;                        //预付款到期日
 	@Excel(name="到货款金额")
 	@Excel(name="到货款金额")
 	private Double arrive_pay;                            //到货款金额
 	private Double arrive_pay;                            //到货款金额
-	@Excel(name="发货日期")
+	@Excel(name="发货日期",format="yyyy-MM-dd")
 	private Date deliver_date;                            //发货日期
 	private Date deliver_date;                            //发货日期
 	@Excel(name="到货款到期日",format="yyyy-MM-dd")
 	@Excel(name="到货款到期日",format="yyyy-MM-dd")
 	private Date arrive_pay_date;                         //到货款到期日
 	private Date arrive_pay_date;                         //到货款到期日

code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml

@@ -533,6 +533,7 @@
 		  amount_state_unid, start_guarantee_date, end_guarantee_date,
 		  amount_state_unid, start_guarantee_date, end_guarantee_date,
 		   mainten_start_point, contract_note, is_delete, project_unid, 
 		   mainten_start_point, contract_note, is_delete, project_unid, 
 		   customer_unid,
 		   customer_unid,
+		   to_char(sign_date,'yyyy') as year, to_char(sign_date,'MM') as month,
 		   (cast(contract_amount as decimal(18,2))-(select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-cast(deduct_amount as decimal(18,2))-cast(stop_amount as decimal(18,2))-cast(exemptions_amount as decimal(18,2))-cast(bad_amount as decimal(18,2))) as contract_remain,
 		   (cast(contract_amount as decimal(18,2))-(select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-cast(deduct_amount as decimal(18,2))-cast(stop_amount as decimal(18,2))-cast(exemptions_amount as decimal(18,2))-cast(bad_amount as decimal(18,2))) as contract_remain,
 		    (select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid) as total_reback_amount,
 		    (select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid) as total_reback_amount,
 		   (select cast(total_recv_amount_view.total_recv_amount as decimal(18,2)) from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid) as total_receive_amount ,
 		   (select cast(total_recv_amount_view.total_recv_amount as decimal(18,2)) from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid) as total_receive_amount ,

code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java

@@ -264,7 +264,7 @@ public class ContractServiceImpl implements ContractService {
 		}
 		}
 		try {
 		try {
 			DownLoad downLoad =new DownLoad();
 			DownLoad downLoad =new DownLoad();
-			downLoad.exportExcel(list, "合同Excel表格", "合同Excel表格", ExportModel.class, "合同Excel表格.xls", response);
+			downLoad.exportExcel(list, "合同Excel表格", "合同Excel表格", ExportModel.class, "合同.xls", response);
 		} catch (Exception e) {
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			e.printStackTrace();