From 44dcddab3956e71989ba22bc575a653a3c5146e1 Mon Sep 17 00:00:00 2001
From: luojian <luojian@DESKTOP-KDBLG14>
Date: Tue, 24 Jul 2018 23:30:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B2=E8=81=94=E5=88=B0=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E6=94=BE=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActualPaymentBatchModify.jsp              |  18 ++-
 WebContent/fileTemplate/付款明细单 (1).xlsx   | Bin 0 -> 9415 bytes
 .../copydata/CalcConditionTempToContract.java |   9 +-
 .../executor/CreateTransactionExecutor.java   |  13 ++-
 .../action/CreateOfficeAction.java            |  21 ++++
 .../checkrisk/CheckEbankStatus.java           |  51 +++++++++
 .../status/UpdateStatusAndSaveDetail.java     | 105 ++++++++++++++++++
 .../CopyFundIncomeTempToFormalCar.java        |  55 +++++++++
 ...LBCustomerAccountTempToFormalBusiness.java |  33 +++++-
 .../LBCustomerRelaProjToContractBusiness.java |   9 +-
 ...tomerRelaTempToFormalBusinessContract.java |   4 +-
 11 files changed, 293 insertions(+), 25 deletions(-)
 create mode 100644 WebContent/fileTemplate/付款明细单 (1).xlsx
 create mode 100644 src_tenwa/com/tenwa/flow/bussinessapprove/checkrisk/CheckEbankStatus.java
 create mode 100644 src_tenwa/com/tenwa/flow/comm/status/UpdateStatusAndSaveDetail.java
 create mode 100644 src_tenwa/com/tenwa/flow/fund/actualpayment/CopyFundIncomeTempToFormalCar.java

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 0000000000000000000000000000000000000000..1403476ddb7c24f01743145cc5ac06c2159bbbc1
GIT binary patch
literal 9415
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
PzykEbQ|l4k@4x;J`*qWL

literal 0
HcmV?d00001

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