Merge branch 'develop' of http://192.168.9.26/platform/finance_serv into develop

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

@@ -608,7 +608,7 @@
 <!-- 		   (select d21_view.d21  from d21_view where d21_view.contract_unid=tb_contract.contract_unid) as mainten_pay_deliver_date,
 <!-- 		   (select d21_view.d21  from d21_view where d21_view.contract_unid=tb_contract.contract_unid) as mainten_pay_deliver_date,
 		   (select d22_view.d21  from d22_view where d22_view.contract_unid=tb_contract.contract_unid) as mainten_pay_acceptanc_date, -->
 		   (select d22_view.d21  from d22_view where d22_view.contract_unid=tb_contract.contract_unid) as mainten_pay_acceptanc_date, -->
 		   to_char((select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid  ), 'yyyy-MM-dd') as deliver_date,
 		   to_char((select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid  ), 'yyyy-MM-dd') as deliver_date,
-		   to_char((select tb_deliver_goods.goods_acceptanc_date from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid and  tb_deliver_goods.deliver_unid = max(tb_deliver_goods.deliver_unid) ), 'yyyy-MM-dd') as goods_acceptanc_date,
+		   to_char((select max(tb_deliver_goods.goods_acceptanc_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid  ), 'yyyy-MM-dd') as goods_acceptanc_date,
 		   to_char((select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid  ), 'yyyy-MM-dd') as acceptanc_date
 		   to_char((select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid  ), 'yyyy-MM-dd') as acceptanc_date
 		    from tb_contract where 1=1
 		    from tb_contract where 1=1
 		    <if test="contract_unid !=null and contract_unid !=''">
 		    <if test="contract_unid !=null and contract_unid !=''">

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

@@ -101,6 +101,7 @@ public class ContractServiceImpl implements ContractService {
 		head_title_name.put("acceptanc_pay_date","验收款到期日");
 		head_title_name.put("acceptanc_pay_date","验收款到期日");
 		head_title_name.put("mainten_pay","质保金额");
 		head_title_name.put("mainten_pay","质保金额");
 		head_title_name.put("mainten_pay_date","质保款到期日");
 		head_title_name.put("mainten_pay_date","质保款到期日");
+		head_title_name.put("goods_acceptanc_date", "到货验收日期");
 	}
 	}
 	
 	
 	private static Map<String,String> head_title_key = new HashMap<String,String>();
 	private static Map<String,String> head_title_key = new HashMap<String,String>();
@@ -136,6 +137,7 @@ public class ContractServiceImpl implements ContractService {
 		head_title_key.put("acceptanc_pay_date","acceptanc_pay_date");
 		head_title_key.put("acceptanc_pay_date","acceptanc_pay_date");
 		head_title_key.put("mainten_pay","mainten_pay");
 		head_title_key.put("mainten_pay","mainten_pay");
 		head_title_key.put("mainten_pay_date","mainten_pay_date");
 		head_title_key.put("mainten_pay_date","mainten_pay_date");
+		head_title_key.put("goods_acceptanc_date", "goods_acceptanc_date");
 	}
 	}
 	@Autowired
 	@Autowired
 	ContractMapper contractMapper;
 	ContractMapper contractMapper;