diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp
index d558c2743..84b5484e5 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp
@@ -7,13 +7,17 @@
     */
 	String sPrevUrl = CurPage.getParameter("PrevUrl");
 	if(sPrevUrl == null) sPrevUrl = "";
-
+	String phaseNo = CurPage.getParameter("PhaseNo");
 	String sTempletNo = "ActualPaymentBatchModify";//--模板号--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	if("0020".equals(phaseNo)||"0030".equals(phaseNo)){
+		doTemp.setVisible("EBANK_STATUS", false);
+		doTemp.setReadOnly("BANK", true);
+		doTemp.setRequired("BANK", false);
+	}
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";
 	dwTemp.genHTMLObjectWindow("");
-	
 	String sButtons[][] = {
 		{"true","All","Button","保存","保存所有修改","save()","","","",""},
 		{"true","All","Button","返回","返回列表","returnList()","","","",""}
@@ -22,19 +26,27 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	$(function(){
+		if("0040"=="<%=phaseNo%>"){
+			 $("#EBANK_STATUS option[value='01']").remove();  
+			 $("#EBANK_STATUS option[value='02']").remove();
+			 $("#EBANK_STATUS option[value='03']").remove();  
+		 }
 		$("#MEMO").css("width",document.body.scrollWidth/2+200);
 	})
 	
 	function save(){
 		if(!iV_all('myiframe0'))return;
 		var data = {};
-		data["APPLYPAY_DATE"] = getItemValue(0,getRow(0),"APPLYPAY_DATE");
+		data["FACT_DATE"] = getItemValue(0,getRow(0),"FACT_DATE");
 		data["ACCOUNTING_DATE"] = getItemValue(0,getRow(0),"ACCOUNTING_DATE");
 		data["SETTLE_METHOD"] = getItemValue(0,getRow(0),"SETTLE_METHOD");
 		data["BANK"] = getItemValue(0,getRow(0),"BANK");
 		data["ACCOUNT"] = getItemValue(0,getRow(0),"ACCOUNT");
 		data["ACC_NUMBER"] = getItemValue(0,getRow(0),"ACC_NUMBER");
 		data["MEMO"] = getItemValue(0,getRow(0),"MEMO");
+		if("0040"=="<%=phaseNo%>"){
+			data["EBANK_STATUS"] = getItemValue(0,getRow(0),"EBANK_STATUS");
+		 }
 		AsDialog.ClosePage(data);
 	}
 	
diff --git a/WebContent/fileTemplate/浠樻鏄庣粏鍗� (1).xlsx b/WebContent/fileTemplate/浠樻鏄庣粏鍗� (1).xlsx
new file mode 100644
index 000000000..1403476dd
Binary files /dev/null and b/WebContent/fileTemplate/浠樻鏄庣粏鍗� (1).xlsx differ
diff --git a/calc/com/tenwa/reckon/copydata/CalcConditionTempToContract.java b/calc/com/tenwa/reckon/copydata/CalcConditionTempToContract.java
index a4fd7d9a5..6eb8e41ce 100644
--- a/calc/com/tenwa/reckon/copydata/CalcConditionTempToContract.java
+++ b/calc/com/tenwa/reckon/copydata/CalcConditionTempToContract.java
@@ -2,6 +2,7 @@ package com.tenwa.reckon.copydata;
 
 import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
 import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
 
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.JBOFactory;
@@ -25,11 +26,11 @@ public class CalcConditionTempToContract extends Bizlet{
 		
 		BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO_TEMP.CLASS_NAME, "flowunid=:flowunid").setParameter("flowunid", sFlowUnid).getSingleResult(false);
 		
+		BizObject projinfo=JBOFactory.createBizObjectQuery(LB_PROJECT_INFO.CLASS_NAME, "id=:id").setParameter("id", contract!=null?contract.getAttribute(LB_CONTRACT_INFO_TEMP.PROJECT_ID).toString():"").getSingleResult(false);
+
 		String sContractId=flow.getAttribute("contract_id").getString();//合同号
-		String rent_method=contract.getAttribute("RENT_METHOD").getString();
-		
-		
-		if("010".equals(rent_method)){
+		//String rent_method=contract.getAttribute("RENT_METHOD").getString();
+		if("1".equals(projinfo!=null?projinfo.getAttribute(LB_PROJECT_INFO.BUSINESSTYPE).toString():"")){//汽车
 			ser.tempToContractOne(sFlowUnid,sContractId,Sqlca);
 		}else{
 			ser.tempToContractMany(sFlowUnid, sContractId, Sqlca);
diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
index 937f59b1c..ec80fcf17 100644
--- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
+++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
@@ -196,7 +196,8 @@ public class CreateTransactionExecutor implements Transaction {
 			String periodType = boLCC.getAttribute("PERIOD_TYPE").getString();
 			String incomeIntervalMonth = boLCC.getAttribute("INCOME_INTERVAL_MONTH").getInt() + "";
 			List<String> planDateList = getPlanDateList(incomeNumber, periodType, incomeIntervalMonth, startDate);
-			Sqlca.executeSQL(new SqlObject("insert into lc_rent_plan select * from lc_pay_rent_plan where payment_number = '" + this.plannumber + "'"));
+			String insertSql="insert into lc_rent_plan(id,quot_id,cust_id, project_id, project_plan_number,contract_id,contract_plan_number,payment_number,plan_list,plan_date,plan_status,rent,corpus,interest,penalty,corpus_business,interest_business,rent_adjust,all_remain_corpus,settle_method,coin,year_rate,memo,flowunid,inputuserid,inputorgid,inputtime,updateuserid,updateorgid,updatetime,interest_date) select id,quot_id,cust_id, project_id, project_plan_number,contract_id,contract_plan_number,payment_number,plan_list,plan_date,plan_status,rent,corpus,interest,penalty,corpus_business,interest_business,rent_adjust,all_remain_corpus,settle_method,coin,year_rate,memo,flowunid,inputuserid,inputorgid,inputtime,updateuserid,updateorgid,updatetime,interest_date from lc_pay_rent_plan where payment_number = '" + this.plannumber + "'";
+			Sqlca.executeSQL(new SqlObject(insertSql));
 			Connection conn = Sqlca.getConnection(Sqlca);
 			PreparedStatement ps = conn.prepareStatement("update lc_rent_plan set plan_date = ? where payment_number = '" + this.plannumber + "' and plan_list = ?");
 			for(int i = 0; i < planDateList.size(); i ++) {
@@ -229,17 +230,17 @@ public class CreateTransactionExecutor implements Transaction {
 			//sql += ",flowunid";//create_date,creator_ "+DateUtil.getSystemDate()+"' create_date ,'"+SecurityUtil.getPrincipal().getId()+"' creator_"
 			sql += " )";
 			
-			sql +=" select sys_guid() id,max(t.project_id),max(t.project_plan_number),max(t.contract_id),max(t.contract_plan_number),max(t.payment_number),t.plan_date,sum(t.flowin) fundin,nvl(wmsys.wm_concat(case when t.flowindetail='' then null else t.flowindetail end ),'-') fundindetails, ";
-			sql +="   sum(t.flowout) fundout ,nvl(wmsys.wm_concat(case when t.flowoutdetail='' then null else t.flowoutdetail end),'-') fundoutdetails,sum(t.cleanfow)netflow " ;
+			sql +=" select replace(uuid(),'-','') id,max(t.project_id),max(t.project_plan_number),max(t.contract_id),max(t.contract_plan_number),max(t.payment_number),t.plan_date,sum(t.flowin) fundin,ifnull(group_concat(if(t.flowindetail='',null,t.flowindetail)),'-') fundindetails, ";
+			sql +="   sum(t.flowout) fundout ,ifnull(group_concat(if(t.flowoutdetail='',null,t.flowoutdetail)),'-')fundoutdetails ,sum(t.cleanfow)netflow " ;
 			sql +="  from  (" ;
-			sql +="  select cfrp.project_id,cfrp.project_plan_number,cfrp.contract_id,cfrp.contract_plan_number,cfrp.payment_number,cfrp.plan_date,cfrp.rent flowin,'第'||cfrp.plan_list||'期租金:'||to_char(cfrp.rent,'FM9,999,999,999,999,999,999,999,990.00') flowindetail,0 flowout,'' flowoutdetail,cfrp.rent-0  cleanfow " ;
+			sql +="  select cfrp.project_id,cfrp.project_plan_number,cfrp.contract_id,cfrp.contract_plan_number,cfrp.payment_number,cfrp.plan_date,cfrp.rent flowin,concat('第',cfrp.plan_list,'期租金:',format(cfrp.rent,2)) flowindetail,0 flowout,'' flowoutdetail,cfrp.rent-0  cleanfow " ;
 			sql +="    from  lc_rent_plan cfrp" ;
 			sql +="    where cfrp.payment_number='" + paymentNumber + "'" ;
 			sql +="    union all " ;
 			sql +="    select fundplan.project_id,fundplan.project_plan_number,fundplan.contract_id,fundplan.contract_plan_number,fundplan.payment_number,fundplan.plan_date,case when fundplan.pay_type='pay_type_in'then fundplan.plan_money else 0 end flowin, ";
-			sql +="    case when fundplan.pay_type='pay_type_in'then concat(concat(tdd.itemname,':'),to_char(fundplan.plan_money,'FM9,999,999,999,999,999,999,999,990.00')) else ''end, " ;
+			sql +="    case when fundplan.pay_type='pay_type_in'then concat(tdd.itemname,':',fundplan.plan_money) else ''end, " ;
 			sql +="    case when fundplan.pay_type='pay_type_out'then fundplan.plan_money else 0 end flowout, " ;
-			sql +="    case when fundplan.pay_type='pay_type_out' then tdd.itemname||':'||to_char(fundplan.plan_money,'FM9,999,999,999,999,999,999,999,990.00') else ''end flowoutdetail, " ;
+			sql +="    case when fundplan.pay_type='pay_type_out' then concat(tdd.itemname,':',fundplan.plan_money) else ''end flowoutdetail, " ;
 			sql +="    case when fundplan.pay_type='pay_type_in' then fundplan.plan_money else -fundplan.plan_money end cleanfow " ;
 			sql +="     from lc_fund_plan fundplan " ;
 			sql +="    left join code_library tdd on  fundplan.fee_type = tdd.itemno " ;
diff --git a/src_core/com/tenwa/officetempalte/action/CreateOfficeAction.java b/src_core/com/tenwa/officetempalte/action/CreateOfficeAction.java
index 863a77876..6470a8b1a 100644
--- a/src_core/com/tenwa/officetempalte/action/CreateOfficeAction.java
+++ b/src_core/com/tenwa/officetempalte/action/CreateOfficeAction.java
@@ -27,6 +27,7 @@ public class CreateOfficeAction {
 	public String templateParam; //模板参数
 	
 	public String templateIds;//要生成的合同模板
+	public String ids;
 	
 	//根据前台参数生成文档
 	public String createOfficeByTemplate(JBOTransaction tx) throws Exception{
@@ -107,6 +108,18 @@ public class CreateOfficeAction {
 		}
 		return "success";
 	}
+	public String createFundIncomeExcel(JBOTransaction tx) throws Exception {
+		try {
+			Transaction Sqlca=Transaction.createTransaction(tx);
+			this.ids = this.ids.replaceAll("△", ",");
+			String sql="update LC_FUND_INCOME_TEMP set EBANK_STATUS='02' where id in(" + this.ids + ")";
+			Sqlca.executeSQL(sql);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return e.getMessage();
+		}
+		return "success";
+	}
 	
 	public String getTemplateNo() {
 		return templateNo;
@@ -135,5 +148,13 @@ public class CreateOfficeAction {
 		// TODO Auto-generated method stub
 		
 	}
+
+	public String getIds() {
+		return ids;
+	}
+
+	public void setIds(String ids) {
+		this.ids = ids;
+	}
 	
 }
diff --git a/src_tenwa/com/tenwa/flow/bussinessapprove/checkrisk/CheckEbankStatus.java b/src_tenwa/com/tenwa/flow/bussinessapprove/checkrisk/CheckEbankStatus.java
new file mode 100644
index 000000000..11739f4cc
--- /dev/null
+++ b/src_tenwa/com/tenwa/flow/bussinessapprove/checkrisk/CheckEbankStatus.java
@@ -0,0 +1,51 @@
+package com.tenwa.flow.bussinessapprove.checkrisk;
+
+import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.template.check.DefaultBussinessCheck;
+
+public class CheckEbankStatus extends DefaultBussinessCheck {
+
+	@Override
+	public Object run(Transaction Sqlca) throws Exception {
+		String flowunid=this.getAttribute("ObjectNo").toString();
+		String sql = "";
+		sql = " select  count(1) cou,sum(case when instr('01,02',lc.ebank_status)>0 or lc.ebank_status is null  then "+
+			  "1 else 0 end) numberUo,sum(case when lc.ebank_status='02'  then 1 else 0 end) numberNo,sum(case when lc.ebank_status='01'  then 1 else 0 end) numberYo from lc_fund_income_temp lc where lc.flowunid = '"+flowunid+"'";
+		ASResultSet rs = Sqlca.getASResultSet(new SqlObject(sql));
+		StringBuilder sb =new StringBuilder("[");
+        int cou=0,numberUo=0,numberNo=0,numberYo=0;
+		while(rs.next()){
+			cou+=Integer.parseInt(rs.getString("cou"));
+			numberUo+=Integer.parseInt(rs.getString("numberUo"));
+			numberNo+=Integer.parseInt(rs.getString("numberNo"));
+			numberYo+=Integer.parseInt(rs.getString("numberYo"));
+		}
+		if(cou>0){
+			if(cou-numberUo==cou){
+				setPass(true);
+			}else{
+				if(numberNo>0&&numberYo>0){
+					sb.append("本次付款明细还有"+(numberYo)+"条数据未导出,未回盘还有"+(numberNo)+"条!");
+					putMsg(sb.toString());
+					setPass(false);
+				}else if(numberYo>0){
+					sb.append("本次付款明细还有"+(numberYo)+"条数据未导出!");
+					putMsg(sb.toString());
+					setPass(false);
+				}else if(numberNo>0){
+					sb.append("本次付款明细还有"+(numberNo)+"条数据未回盘!");
+					putMsg(sb.toString());
+					setPass(false);
+				}
+			}
+		}else{
+			sb.append("]未导出付款明细");
+			putMsg(sb.toString());
+			setPass(false);
+		}
+		return null;
+	}
+
+}
diff --git a/src_tenwa/com/tenwa/flow/comm/status/UpdateStatusAndSaveDetail.java b/src_tenwa/com/tenwa/flow/comm/status/UpdateStatusAndSaveDetail.java
new file mode 100644
index 000000000..35d900797
--- /dev/null
+++ b/src_tenwa/com/tenwa/flow/comm/status/UpdateStatusAndSaveDetail.java
@@ -0,0 +1,105 @@
+package com.tenwa.flow.comm.status;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
+import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.util.StringFunction;
+import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+/**
+ *
+ * @author jianghd
+ *
+ */
+
+public class UpdateStatusAndSaveDetail extends BaseBussiness{
+	public Object run(Transaction Sqlca) throws Exception{
+		this.initBussinessParam(Sqlca.getTransaction());
+		String sFlowUnid = (String)this.getAttribute("ObjectNo");
+		String ProjectId = (String)this.getAttribute("ProjectId");
+		String ContractId = (String)this.getAttribute("ContractId");
+		String statusCode = (String)this.getAttribute("statusCode");
+		String contractNumber = (String)this.getAttribute("ContractNumber");
+		String userId = (String)this.getAttribute("CurUserID");
+		String PhaseNo = (String)this.getAttribute("PhaseNo");
+		if(!"0010".equals(PhaseNo)&&PhaseNo!=null){
+			userId = (String)this.getAttribute("CurFlowUserId");
+		}
+		String orgId = new ASUser(userId).getOrgID();
+		
+		String apprlyType = (String)this.getAttribute("applyType");
+		
+		if("ActualPaymentApply".equals(apprlyType)){//实际放款流程
+			BizObjectManager lfitBom = JBOFactory.getBizObjectManager(LC_FUND_INCOME_TEMP.CLASS_NAME,Sqlca);
+			List<BizObject> lfitBos=lfitBom.createQuery("FLOWUNID=:FlowUnid").setParameter("FlowUnid", sFlowUnid).getResultList(false);
+			for (BizObject lfitbo : lfitBos) {//对批量的合同更新进度
+				ProjectId = lfitbo.getAttribute("PROJECT_ID").getString();
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
+				String now = sdf.format(new Date(System.currentTimeMillis()));
+				JBOFactory.getBizObjectManager(BUSINESS_STATUS.CLASS_NAME,Sqlca)
+	            .createQuery("UPDATE O SET BUSINESS_STATUS='"+statusCode+"',UPDATEUSERID='"+userId+"',UPDATEORGID='"+orgId+"',UPDATETIME='"+now+"' WHERE CONTRACT_NUMBER=(SELECT LPI.CONTRACT_NUMBER FROM "+LB_PROJECT_INFO.CLASS_NAME+" LPI WHERE LPI.ID='"+ProjectId+"')").executeUpdate();
+				
+				SqlObject so = new SqlObject("INSERT INTO BUSINESS_DETAIL(ID,CONTRACT_NUMBER,BUSINESS_STATUS,INPUTUSERID,INPUTORGID,INPUTTIME) SELECT SYS_GUID(),CONTRACT_NUMBER,'"+statusCode+"','"+userId+"','"+orgId+"','"+StringFunction.getTodayNow().replaceAll(":", "△")+"' FROM LB_PROJECT_INFO WHERE ID='"+ProjectId+"'");
+		        so.setDebugSql(so.getDebugSql().replaceAll("△", ":"));
+		        so.setOriginalSql(so.getOriginalSql().replaceAll("△", ":"));
+		        so.setRunSql(so.getRunSql().replaceAll("△", ":"));
+		        Sqlca.executeSQL(so);
+			}
+		}else{
+			if(contractNumber==null){
+				//FlowKey,ProjectName,ContractId
+				String sql = "";
+				if(ContractId!=null){
+					sql = "SELECT LPI.CONTRACT_NUMBER FROM LB_CONTRACT_INFO LPI WHERE LPI.ID='"+ContractId+"'";
+				}else{
+					sql = "SELECT LPI.CONTRACT_NUMBER FROM LB_PROJECT_INFO LPI WHERE LPI.ID='"+ProjectId+"'";
+				}
+				SqlObject lpisql = new SqlObject(sql);
+				ASResultSet ass = Sqlca.getASResultSet(lpisql);
+				if(ass.next()){
+					contractNumber = ass.getString("CONTRACT_NUMBER");
+				}
+			}
+			BizObjectManager bsBom = JBOFactory.getBizObjectManager(BUSINESS_STATUS.CLASS_NAME,Sqlca);
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
+			String now = sdf.format(new Date(System.currentTimeMillis()));
+			BizObject bo = bsBom.createQuery("CONTRACT_NUMBER=:ContractNumber").setParameter("ContractNumber", contractNumber).getSingleResult(true);
+			String bStatus = "";
+			if(bo!=null){
+				bStatus = bo.getAttribute("BUSINESS_STATUS").getString();
+			}else{//初始化BussinessStatus
+				bo = bsBom.newObject();
+				bo.setAttributeValue("BUSINESS_STATUS","1");
+				bo.setAttributeValue("CONTRACT_NUMBER",contractNumber);
+				bo.setAttributeValue("INPUTUSERID",userId);
+				bo.setAttributeValue("INPUTORGID",orgId);
+				bo.setAttributeValue("INPUTTIME",now);
+				bsBom.saveObject(bo);
+				bStatus = "1";
+			}			
+			bsBom.createQuery("UPDATE O SET BUSINESS_STATUS='"+statusCode+"',UPDATEUSERID='"+userId+"',UPDATEORGID='"+orgId+"',UPDATETIME='"+now+"' WHERE CONTRACT_NUMBER='"+contractNumber+"'").executeUpdate();
+	        
+	        SqlObject so = new SqlObject("INSERT INTO BUSINESS_DETAIL(ID,CONTRACT_NUMBER,BUSINESS_STATUS,INPUTUSERID,INPUTORGID,INPUTTIME,BEFORE_STATUS) SELECT replace(uuid(),'-',''),CONTRACT_NUMBER,'"+statusCode+"','"+userId+"','"+orgId+"','"+StringFunction.getTodayNow().replaceAll(":", "△")+"','"+bStatus+"' FROM LB_PROJECT_INFO WHERE ID='"+ProjectId+"'");
+	        so.setDebugSql(so.getDebugSql().replaceAll("△", ":"));
+	        so.setOriginalSql(so.getOriginalSql().replaceAll("△", ":"));
+	        so.setRunSql(so.getRunSql().replaceAll("△", ":"));
+	        Sqlca.executeSQL(so);
+		}
+		
+		
+		String sMessage="true"; 
+		return sMessage;
+	}
+	
+}
diff --git a/src_tenwa/com/tenwa/flow/fund/actualpayment/CopyFundIncomeTempToFormalCar.java b/src_tenwa/com/tenwa/flow/fund/actualpayment/CopyFundIncomeTempToFormalCar.java
new file mode 100644
index 000000000..7ed3e66d9
--- /dev/null
+++ b/src_tenwa/com/tenwa/flow/fund/actualpayment/CopyFundIncomeTempToFormalCar.java
@@ -0,0 +1,55 @@
+package com.tenwa.flow.fund.actualpayment;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jbo.app.tenwa.calc.LB_ACTUAL_PAYMENT_INFO;
+import jbo.app.tenwa.calc.LB_ACTUAL_PAYMENT_INFO_TEMP;
+import jbo.app.tenwa.calc.LC_FUND_INCOME;
+import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+/**
+ * 拷贝资金付款数据到正式表(实际付款通过)
+ * @author zhouyahui
+ *
+ */
+
+public class CopyFundIncomeTempToFormalCar extends BaseBussiness{
+	public Object run(Transaction Sqlca) throws Exception{
+		this.initBussinessParam(Sqlca.getTransaction());
+		String sFlowUnid = (String)this.getAttribute("ObjectNo");
+		BizObjectManager bomLFIT = JBOFactory.getBizObjectManager(LC_FUND_INCOME_TEMP.CLASS_NAME);
+		Sqlca.join(bomLFIT);
+		bomLFIT.createQuery("update O set is_flowing='1' where flowunid=:FLOWUNID").setParameter("FLOWUNID", sFlowUnid).executeUpdate();
+		List<BizObject> bos = bomLFIT.createQuery("flowunid=:flowunid and pay_status<>'apply_return' and  ebank_status='05' ").setParameter("flowunid", sFlowUnid).getResultList(false);
+		if(bos.size() > 0){
+			for(BizObject bo:bos){
+				Map<String,String> fromCondition = new HashMap<String,String>();
+				fromCondition.put("INCOME_ID", bo.getAttribute("INCOME_ID").getString());
+				Map<String,String> toCondition = new HashMap<String,String>();
+				toCondition.put("ID", bo.getAttribute("INCOME_ID").getString());
+				Map<String,String> otherProperty = new HashMap<String,String>();
+				otherProperty.put("FLOWUNID", "");
+				String payType = bo.getAttribute("PAY_TYPE").getString();
+				if("pay_type_out".equals(payType)){
+					otherProperty.put("PAY_STATUS", "have_paid");
+				}else{
+					otherProperty.put("PAY_STATUS", "");
+					otherProperty.put("ROLL_BACK", "0");
+				}
+				DataOperatorUtil.copySingleJBO(LC_FUND_INCOME_TEMP.CLASS_NAME, fromCondition,LC_FUND_INCOME.CLASS_NAME, toCondition, otherProperty,Sqlca.getTransaction());
+			}
+			Map<String,String> condition = new HashMap<String,String>();
+			DataOperatorUtil.copySingleJBO(LB_ACTUAL_PAYMENT_INFO_TEMP.CLASS_NAME, condition,LB_ACTUAL_PAYMENT_INFO.CLASS_NAME, new HashMap<String,String>(), new HashMap<String,String>(),Sqlca.getTransaction());
+		}
+		String sMessage="true"; 
+		return sMessage;
+	}
+}
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java
index dac9f81d5..80b2b4690 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java
@@ -6,20 +6,41 @@ import java.util.Map;
 
 import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
 import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
 import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
 import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
+import jbo.com.tenwa.lease.comm.LB_EQUIPMENT;
+import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
 import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
+
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.awe.util.Transaction;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService;
+import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum;
+import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp;
 import com.tenwa.lease.flow.project.businessapply.CustomerCompare;
 
 public class LBCustomerAccountTempToFormalBusiness extends BaseBussiness{
 	@Override
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
-		String contract_id="";
+		Map<String,String>fromCondtion=this.getDefaultTempToFormalFromCondtion();
+		Map<String,String> toCondtion=new HashMap<String,String>();
+		toCondtion.put("PROJECT_ID",this.getAttribute("ProjectId").toString());        
+		Map<String,String> otherProperty=new HashMap<String,String>();
+		otherProperty.put("CONTRACT_ID",this.getAttribute("ContractId").toString());
+		DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, fromCondtion,CUSTOMER_ACCOUNT.CLASS_NAME, toCondtion, otherProperty,null, Sqlca);
+		DataOperatorUtil.copyJBOSet(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, fromCondtion,LB_GUARANTEE_UNIT.CLASS_NAME, toCondtion, otherProperty,null, Sqlca);
+		fromCondtion.clear();
+		fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
+		fromCondtion.put("Partner_", "Y");
+		DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion,CUSTOMER_FAMILY.CLASS_NAME, toCondtion, otherProperty,null, Sqlca);
+		/*		String contract_id="";
 		Map<String,String> fromCondtion = new HashMap<String, String>();
 		Map<String,String> otherProperty = new HashMap<String, String>();
 	    fromCondtion.clear();
@@ -32,15 +53,15 @@ public class LBCustomerAccountTempToFormalBusiness extends BaseBussiness{
 		if(contractbo!=null){
 		 contract_id=contractbo.getAttribute("ID").toString();
 	    }
-	fromCondtion.clear();
-	fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());	
+	    fromCondtion.clear();
+	    fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());	
 	//fromCondtion.put("contract_id",contract_id);	
 		List<BizObject> unionList= DataOperatorUtil.getSetJBO(LB_UNION_LESSEE_TEMP.CLASS_NAME, fromCondtion, Sqlca);
 	
 		
 		CustomerCompare cc=new CustomerCompare();
-/*		if((busbo.getAttribute("FLOW_NAME").getString()).equals("合同制作流程")&&contractbl.size()<=1){
-*/			if((busbo.getAttribute("FLOW_NAME").getString()).equals("合同制作流程")){
+		if((busbo.getAttribute("FLOW_NAME").getString()).equals("合同制作流程")&&contractbl.size()<=1){
+			if((busbo.getAttribute("FLOW_NAME").getString()).equals("合同制作流程")){
                for(BizObject union:unionList){
 				fromCondtion.clear();
 				fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
@@ -60,7 +81,7 @@ public class LBCustomerAccountTempToFormalBusiness extends BaseBussiness{
 			  otherProperty.put("contract_id", contract_id);
 	          DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_ACCOUNT.CLASS_NAME, otherProperty, null, cc, Sqlca.getTransaction());
 		}
-		}
+		}*/
 	    String sMessage="true"; 
 		return sMessage;
 	}
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java
index aef64504c..dcfd4311f 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java
@@ -35,17 +35,18 @@ public class LBCustomerRelaProjToContractBusiness  extends BaseBussiness {
 		fromCondtion.put("contract_id","");
 		Map<String,String> other=new HashMap<String, String>();
 		other.put("flowunid",this.getAttribute("FlowUnid").toString());
+		DataOperatorUtil.copySingleJBO(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, null, other, Sqlca);
+        DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY_TEMP.CLASS_NAME, null, other, null, Sqlca);
 		List<BizObject> unionList= DataOperatorUtil.getSetJBO(LB_UNION_LESSEE.CLASS_NAME, fromCondtion, Sqlca);
-		List<BizObject> unitList=DataOperatorUtil.getSetJBO(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, Sqlca);
+		//List<BizObject> unitList=DataOperatorUtil.getSetJBO(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, Sqlca);
 		for(BizObject union:unionList){
 			fromCondtion.clear();
 			fromCondtion.put("customerid", union.getAttribute("customer_id").getString());
 	        DataOperatorUtil.copyJBOSet(CUSTOMER_PERSON.CLASS_NAME, fromCondtion, CUSTOMER_PERSON_TEMP.CLASS_NAME, null, other, null, Sqlca);
 	        DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondtion, CUSTOMER_CERT_TEMP.CLASS_NAME, null, other, null, Sqlca);
-	        DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY_TEMP.CLASS_NAME, null, other, null, Sqlca);
 	        DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS_TEMP.CLASS_NAME, null, other, null, Sqlca);
 		}
-		for(BizObject unit:unitList){
+/*		for(BizObject unit:unitList){
 			fromCondtion.clear();
 			fromCondtion.put("id", unit.getAttribute("id").getString());
 			DataOperatorUtil.copySingleJBO(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, null, other, Sqlca);
@@ -56,7 +57,7 @@ public class LBCustomerRelaProjToContractBusiness  extends BaseBussiness {
 	        DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondtion, CUSTOMER_CERT_TEMP.CLASS_NAME, null, other, null, Sqlca);
 	        DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY_TEMP.CLASS_NAME, null, other, null, Sqlca);
 	        DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS_TEMP.CLASS_NAME, null, other, null, Sqlca);
-		}
+		}*/
 		
 		   String sMessage="true"; 
 		return sMessage;
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusinessContract.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusinessContract.java
index de76c6319..c83b71df9 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusinessContract.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusinessContract.java
@@ -75,8 +75,8 @@ public class LBCustomerRelaTempToFormalBusinessContract  extends BaseBussiness {
 		toCondtion.put("PROJECT_ID",this.getAttribute("ProjectId").toString());
 		other.clear();
 		other.put("CONTRACT_ID",this.getAttribute("ContractId").toString());
-		 DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, toCondtion, other, cc, Sqlca);
-		   String sMessage="true"; 
+		DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, toCondtion, other, cc, Sqlca);
+		String sMessage="true"; 
 		return sMessage;
 	}
 }	
\ No newline at end of file