diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 84eef7ff3..d48d75542 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -180,16 +180,17 @@ $(function(){ }); } } + CalcControl.InitLsaseTerm(); CalcControl.PeriodTypeView(); CalcControl.SettleMethodView(); changeSettleMethod2(); changeRateType(); CalcControl.RentOrRateView(); + count++; }else{ changeSettleMethod3(); } - }); function importCustomerQuot(){ @@ -717,11 +718,13 @@ function changeRateType(){ //根据金额算比例 function getRatioByMoney(e){ + debugger; var equipAmt=getItemValue(0,0,"EQUIP_AMT");//设备款 var cleanLeaseMoney=getItemValue(0,0,"CLEAN_LEASE_MONEY");//融资额 var fundRules=calcRules["fund"]; var firstPayment=getItemValue(0,0,"FIRST_PAYMENT");//首付款 - cleanLeaseMoney=Number(equipAmt)-Number(firstPayment); + var finalPayment=getItemValue(0,0,"FINAL_PAYMENT");//尾付款 + cleanLeaseMoney=Number(equipAmt)-Number(firstPayment)-Number(finalPayment); if("<%=productType%>" == "2"){ setItemValue(0,0,"CLEAN_LEASE_MONEY",cleanLeaseMoney); if(!getItemValue(0,getRow(),"CLEAN_LEASE_MONEY")){ diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp index 4b00ea7dc..902d7c001 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp @@ -82,8 +82,8 @@ function saveproj_name(){ },"请选择经销商"); } - //省市 - function selectRegionCode(){ + //省市 + /* function selectRegionCode(){ var area_code = getItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS"); AsDialog.PopView("/Common/ToolsA/AreaVFrame.jsp","AreaCode="+area_code,"dialogWidth=850px;dialogHeight=450px;center:yes;status:no;statusbar:no",function(sAreaCodeInfo){ //增加清空功能的判断 @@ -103,6 +103,42 @@ function saveproj_name(){ } } },'请选择省市'); + } */ + var province="";//定义一个全局变量 + // 选择省份 + function selectProvinceCode(){ + AsDialog.OpenSelector("selectProvinceCode","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", + function(sReturn){ + if(!sReturn||sReturn=="_CANCEL_"||sReturn==""){ + //alert(getHtmlMessage('1'));//请选择一条信息! + return; + } + sReturn = sReturn.split("@"); +// alert(sReturn[1]); + setItemValue(0,0,"provinces",sReturn[1]); + province=sReturn[0]; + setCertType(); + },"请选择省份",''); + } + // 选择市区 + function selectCityCode(){ + //alert("参数:"+province); + if(province=="" || province==null){ + alert("请先选择省份。"); + return; + }else{ + AsDialog.OpenSelector("selectCityCode","province,"+province,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", + function(sReturn){ + + if(!sReturn||sReturn=="_CANCEL_"||sReturn==""){ + //alert(getHtmlMessage('1'));//请选择一条信息! + return; + } + sReturn = sReturn.split("@"); + setItemValue(0,0,"DISTRIBUTOR_ADDRESS",sReturn[0]);//地区区号 + setItemValue(0,0,"DISTRIBUTOR_ADDRESSNAME",sReturn[1]);//地区 + },"请选择地区",''); + } } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp index 7f7023152..a66623f31 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp @@ -40,15 +40,20 @@ var certType = getItemValue(0,getRow(0),"CERTTYPE"); var certId = getItemValue(0,getRow(0),"CERTID"); if(certType==""){ + //setErrorTips("certType","证件类型不能为空!"); alert("证件类型不能为空!"); + return false; } if(certId==""){ + //setErrorTips("certId","证件号不能为空!"); alert("证件号不能为空!"); + return false; } if(certType=="Ent02"){ if(checkORGRight1(certId)){ return true; }else{ + //setErrorTips("certId","组织机构代码格式不正确!"); alert("组织机构代码格式不正确!"); return false; } @@ -57,6 +62,7 @@ if(CheckLicense(certId)){ return true; }else{ + //setErrorTips("certId","身份证格式不正确!"); alert("身份证格式不正确!"); return false; } @@ -64,25 +70,43 @@ if(certType=="Ent03"){ return true; } - } function checkTel(){ var mobile = getItemValue(0,getRow(0),"mobile"); if(mobile==""){ + //setErrorTips("mobile","手机号不能为空!"); alert("手机号不能为空!"); + return false; } if(CheckPhoneCode(mobile)){ return true; }else{ + //setErrorTips("mobile","手机号格式不正确!"); alert("手机号格式不正确!"); return false; } - + } + + function checkWorkTel(){ + var workTel = getItemValue(0,getRow(0),"WORKTEL"); + if(workTel==""){ + //setErrorTips("WORKTEL","单位电话不能为空!"); + alert("单位电话不能为空!"); + return false; + } + if(CheckPhoneCode(workTel)){ + return true; + }else{ + //setErrorTips("WORKTEL","单位电话格式不正确!"); + alert("单位电话格式不正确!"); + return false; + } } function save(){ - if(checkTel()==true&&checkCertId()==true){ + debugger; + if(checkTel()==true&&checkCertId()==true&&checkWorkTel()==true){ as_save(0,"goBack()"); } } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 701d4dfdc..019f696d5 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -65,12 +65,13 @@ var leasfrom = getItemValue(0,getRow(),"LEAS_FORM"); var projectSource = getItemValue(0,getRow(),"PROJECT_SOURCE"); var customerType = "<%=custype%>"; - if(customerType=="01"){ + if(customerType=="01"){//法人 as_save("myiframe0","frame_list.window.as_save(0);"); //as_save(0); } - if(customerType=="03"){ + if(customerType=="03"){//自然人 frame_list.window.saveRecord(leasfrom,projectSource); + //as_save("myiframe0","frame_list.window.as_save(0);"); } } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index 9edfaf7ac..2c8d52fe7 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -15,7 +15,6 @@ String sTempletNo = "BusinessCustomerInfo";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); String custname=CurPage.getParameter("custname"); - System.out.print(custname+"====================="); doTemp.setHtmlEvent("CERTID","onChange","changeCertid"); doTemp.setHtmlEvent("MARRIAGE","onChange","changeChildrensNumber"); String rightType = CurPage.getParameter("RightType");//页面只读与否 @@ -160,6 +159,7 @@ } function saveRecord(leasfrom,projectSource){ + //as_save("myiframe0","frame_list.window.as_save(0);"); <%-- var idexpiry=getItemValue(0,getRow(),"IDEXPIRY"); var date1 = "<%=dateString%>"; if(date1>=idexpiry){ diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index f1052df8f..5a1089959 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -304,7 +304,7 @@ } } -// if(carAttributes=='1'){ +// if(carAttributes=='01'){ // AsDialog.OpenSelector("SelectBusinessType","ProductType,1,TypeNo,0005","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", // function(sReturn){ // if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_") @@ -317,7 +317,7 @@ // setItemValue(0,0,"productId",sReturn[0]); // setItemValue(0,0,"productName",sReturn[1]); // },"请选择产品",''); -// }else if(carAttributes=='2'){ +// }else if(carAttributes=='02'){ // AsDialog.OpenSelector("SelectBusinessType","ProductType,1,TypeNo,0005","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", // function(sReturn){ // if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_") diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index e0cc863c3..8c4d7cff9 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -27,7 +27,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -1080,7 +1080,7 @@ - + @@ -1095,10 +1095,13 @@ - + - \ No newline at end of file + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml index 7f92a0718..3847a095d 100644 --- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml @@ -167,7 +167,7 @@ - + diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml index f26963aa5..22425a72e 100644 --- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml +++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml @@ -1,4 +1,6 @@ + + @@ -6,23 +8,18 @@ - - - - - @@ -58,4 +55,7 @@ + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml index 745c5c90a..96176c8d8 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml @@ -1643,6 +1643,8 @@ + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index ca9643a29..8ac7fef14 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -1346,6 +1346,11 @@ + + + + + @@ -1402,6 +1407,11 @@ + + + + + @@ -2820,7 +2830,6 @@ - @@ -2944,7 +2953,9 @@ - + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index be37202f5..efc907a0e 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -1225,13 +1225,10 @@ - - - - + @@ -1261,11 +1258,9 @@ - - - - - + + + @@ -1315,6 +1310,9 @@ + + + @@ -1367,13 +1365,9 @@ - - - - - + @@ -1670,11 +1664,9 @@ - - - - - + + + @@ -2536,5 +2528,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 5ceb9bb47..2aab17627 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -1857,7 +1857,7 @@ - + diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index 799c52b6b..7f5f3e22c 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -39,6 +39,7 @@ public class ProductCondition { this.getProductAdjustRules(doTemp, productId);//调息 this.getGrossRules(doTemp, productId);// //this.setDateRule(doTemp, productId);//日期 + this.getCautionRatio(doTemp, productId);//保证金比例 return sb.toString(); } @@ -409,7 +410,6 @@ public class ProductCondition { } } } - } public String getSqlWhere(String condition){ String[] conds=condition.split(","); @@ -420,5 +420,11 @@ public class ProductCondition { } return s; } - + //获取保证金比例 + public void getCautionRatio(ASObjectModel doTemp,String productId) throws Exception{ + String caution_money = ProductParamUtil.getProductParameterValue(productId, "PRD0315","CAUTION_MONEY","CostType09"); + String INCOME_NUMBER = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","INCOME_NUMBER"); + doTemp.setDefaultValue("CAUTION_MONEY_RATIO",caution_money); + doTemp.setDefaultValue("INCOME_NUMBER",INCOME_NUMBER); + } } diff --git a/src_cmb/com/tenwa/sdk/controller/PayController.java b/src_cmb/com/tenwa/sdk/controller/PayController.java index 4cab547b8..9a30ab3b8 100644 --- a/src_cmb/com/tenwa/sdk/controller/PayController.java +++ b/src_cmb/com/tenwa/sdk/controller/PayController.java @@ -338,8 +338,8 @@ public class PayController extends BaseFlowStartAction { pay_detail_list = new ArrayList(); for (String income_id : income_ids) { String date = df.format(new Date()); - pay_detail = new SDKDcPayReqxVO(); - infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false); + pay_detail = new SDKDcPayReqxVO(); + infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.distributor_id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false); if(infoOne==null) { map.put("code", "1") ; map.put("msg", "第["+index+"]笔数据不存在,请检查") ; diff --git a/src_tenwa/com/tenwa/flow/comm/handler/LBGuarantorPerUnitHandler.java b/src_tenwa/com/tenwa/flow/comm/handler/LBGuarantorPerUnitHandler.java index 4759069b5..63ca7481d 100644 --- a/src_tenwa/com/tenwa/flow/comm/handler/LBGuarantorPerUnitHandler.java +++ b/src_tenwa/com/tenwa/flow/comm/handler/LBGuarantorPerUnitHandler.java @@ -18,6 +18,7 @@ public class LBGuarantorPerUnitHandler extends CommonHandler{ BizObject ci = cpt.newObject(); ci.setAttributeValue("CUSTOMERID", bo.getAttribute("ASSUROR").getString()); ci.setAttributeValue("FULLNAME", bo.getAttribute("FULLNAME").getString()); + ci.setAttributeValue("FLOWUNID", bo.getAttribute("FLOWUNID").getString()); ci.setAttributeValue("SEX", bo.getAttribute("SEX").getString()); ci.setAttributeValue("CERTTYPE", bo.getAttribute("CERTTYPE").getString()); ci.setAttributeValue("CERTID", bo.getAttribute("CERTID").getString()); @@ -38,8 +39,9 @@ public class LBGuarantorPerUnitHandler extends CommonHandler{ protected void afterUpdate(JBOTransaction tx, BizObject bo) throws Exception { String customerid = bo.getAttribute("ASSUROR").getString(); + String flowunid = bo.getAttribute("FLOWUNID").getString(); BizObjectManager cpt = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME, tx); - BizObject ci = cpt.createQuery("select * from O where CUSTOMERID=:customerid").setParameter("customerid", customerid).getSingleResult(true); + BizObject ci = cpt.createQuery("CUSTOMERID=:customerid and FLOWUNID=:flowunid").setParameter("customerid", customerid).setParameter("flowunid", flowunid).getSingleResult(true); ci.setAttributeValue("FULLNAME", bo.getAttribute("FULLNAME").getString()); ci.setAttributeValue("SEX", bo.getAttribute("SEX").getString()); ci.setAttributeValue("CERTTYPE", bo.getAttribute("CERTTYPE").getString()); @@ -53,6 +55,5 @@ public class LBGuarantorPerUnitHandler extends CommonHandler{ ci.setAttributeValue("other_income", bo.getAttribute("other_income").getString()); ci.setAttributeValue("title", bo.getAttribute("title").getString()); cpt.saveObject(ci); - tx.commit(); } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBGuaranteePerUnitTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBGuaranteePerUnitTempToFormalBusiness.java new file mode 100644 index 000000000..fbbf5c36e --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBGuaranteePerUnitTempToFormalBusiness.java @@ -0,0 +1,58 @@ +package com.tenwa.lease.flow.project.commbusiness; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.app.tenwa.customer.CUSTOMER_PERSON; +import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; +import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT; +import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_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; +import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; +import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; +import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; + +public class LBGuaranteePerUnitTempToFormalBusiness extends BaseBussiness { + + @SuppressWarnings("unchecked") + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowunid = this.getAttribute("ObjectNo").toString(); + Map fromCondtion = new HashMap(); + Map toCondtion = new HashMap(); + BizObjectManager lgut = JBOFactory.getBizObjectManager(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME,Sqlca); + List lguts = lgut.createQuery("select * from O left join jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP cpt " + + "on O.ASSUROR=cpt.CUSTOMERID where O.flowunid=:flowUnid and O.DATA_STATE='guarantee'") + .setParameter("flowUnid", flowunid).getResultList(false); + for (BizObject lgu:lguts) { + if(fromCondtion.size()>0){ + fromCondtion.clear(); + } + if(toCondtion.size()>0){ + toCondtion.clear(); + } + fromCondtion.put("id",lgu.getAttribute("id").toString()); + toCondtion.put("ASSUROR", lgu.getAttribute("ASSUROR").toString()); + DataOperatorUtil.copySingleJBO(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, fromCondtion, LB_GUARANTEE_UNIT.CLASS_NAME, toCondtion, null, Sqlca); + if(fromCondtion.size()>0){ + fromCondtion.clear(); + } + if(toCondtion.size()>0){ + toCondtion.clear(); + } + fromCondtion.put("CUSTOMERID",lgu.getAttribute("ASSUROR").toString()); + toCondtion.put("CUSTOMERID", lgu.getAttribute("ASSUROR").toString()); + DataOperatorUtil.copySingleJBO(CUSTOMER_PERSON_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_PERSON.CLASS_NAME, toCondtion, null, Sqlca); + } + String sMessage="true"; + return sMessage; + } +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBGuaranteeUnitFormalToTempBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBGuaranteeUnitFormalToTempBusiness.java index 41d8bfc66..a9a9d4275 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBGuaranteeUnitFormalToTempBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBGuaranteeUnitFormalToTempBusiness.java @@ -54,8 +54,12 @@ public class LBGuaranteeUnitFormalToTempBusiness extends BaseBussiness { if(fromCondtion.size()>0){ fromCondtion.clear(); } + if(otherProperty.size()>0){ + otherProperty.clear(); + } fromCondtion.put("CUSTOMERID",lgu.getAttribute("ASSUROR").toString()); - DataOperatorUtil.copySingleJBO(CUSTOMER_PERSON.CLASS_NAME, fromCondtion, CUSTOMER_PERSON_TEMP.CLASS_NAME, null, null, Sqlca); + otherProperty.put("FLOWUNID", flowUnid); + DataOperatorUtil.copySingleJBO(CUSTOMER_PERSON.CLASS_NAME, fromCondtion, CUSTOMER_PERSON_TEMP.CLASS_NAME, null, otherProperty, Sqlca); } String sMessage="true"; diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index e1bc9c92a..a129526ac 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -77,8 +77,6 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { if(certType.equals("Ent02")){ bmCC.setAttributeValue("flowunid", this.getAttribute("FlowUnid")); bmCC.setAttributeValue("customerid", customerId); - String custname = this.getAttribute("custname").toString(); - String certid = this.getAttribute("certid").toString(); bmCC.setAttributeValue("enterprisename", this.getAttribute("custname")); bmCC.setAttributeValue("certid", this.getAttribute("certid")); bmCCT.saveObject(bmCC); @@ -107,13 +105,9 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { bo.setAttributeValue("project_name",this.getAttribute("ProjectNo")); bo.setAttributeValue("project_manage",this.getAttribute("CurUserID")); bo.setAttributeValue("project_dept",asUser.getOrgID()); - - String versionid = this.getAttribute("versionid").toString(); - String bustype = this.getAttribute("businessType").toString(); - bo.setAttributeValue("VERSIONID", this.getAttribute("versionid")); bo.setAttributeValue("BUSINESSTYPE", this.getAttribute("businessType")); - bo.setAttributeValue("LEAS_FORM", this.getAttribute("leasehold"));//默认回租 + bo.setAttributeValue("LEAS_FORM", this.getAttribute("leasehold"));//租赁方式 bo.setAttributeValue("PRODUCT_ID",this.getAttribute("ProductId"));//业务品种编号 bo.setAttributeValue("PRODUCT_NAME",this.getAttribute("ProductName"));//业务品种名称 bo.setAttributeValue("PROJECT_STATUS","0");