diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp index 108a385fa..7c33e6205 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp @@ -20,7 +20,7 @@ String compClientID = request.getParameter("CompClientID"); dwTemp.replaceColumn("loaned", "", CurPage.getObjectWindowOutput()); - dwTemp.replaceColumn("outstand", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("outstand", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp index 86c6f450d..20f239a6a 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp @@ -6,7 +6,7 @@ String certId = CurPage.getParameter("certId"); ASObjectModel doTemp = new ASObjectModel("LoanedList"); - doTemp.appendJboWhere(" and O.CONTRACT_STATUS >= 31 and O.CONTRACT_STATUS <> '104' "); + doTemp.appendJboWhere(" and O.CONTRACT_STATUS >= 31 and O.CONTRACT_STATUS <> '104' and O.CONTRACT_STATUS <> '101' "); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1";//--设置为Grid风格-- dwTemp.ReadOnly = "1";//只读模式 diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp index b7fee3ef2..50df292a2 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp @@ -5,9 +5,10 @@ <% String certId = CurPage.getParameter("certId"); + String flowunId = CurPage.getParameter("flowunId"); ASObjectModel doTemp = new ASObjectModel("LoanedList"); - doTemp.appendJboWhere(" and O.CONTRACT_STATUS < 31 "); + doTemp.appendJboWhere(" and (O.CONTRACT_STATUS < 31 or O.CONTRACT_STATUS = '104' or O.CONTRACT_STATUS = '101') and O.FLOWUNID <> '"+flowunId+"'"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1";//--设置为Grid风格-- dwTemp.ReadOnly = "1";//只读模式 diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index b227e9104..c2d65f7a8 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -24,6 +24,17 @@ String PhaseNo=CurPage.getParameter("PhaseNo"); String subjectId=CurPage.getParameter("SubjectId");//获取主体信息，用于是否签约查询 String channel=CurPage.getParameter("channel"); + + String falg = "false"; + + if("0010".equals(PhaseNo) || "0020".equals(PhaseNo) ){ + falg = "true"; + } + + if("合同制作流程".equals(flowName)){ + falg = "false"; + } + BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); BizObject ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractId).getSingleResult(false); System.out.print("=========="+ldcls+"=========="); @@ -60,7 +71,7 @@ dwTemp.replaceColumn("S_PaymentCard", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { - {"true","","Button","保存","保存所有修改","save()","","","",""}, + {falg,"","Button","保存","保存所有修改","save()","","","",""}, {"false","All","Button","校验银行卡信息","校验银行卡四要素","verifyFourelementBank()","","","","btn_icon_return"} } /* {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp index 2e438cddb..c3351df7f 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp @@ -11,6 +11,8 @@ String contractid = CurPage.getParameter("ContractId"); String showtype = CurPage.getParameter("ShowType"); String PhaseNo = CurPage.getParameter("PhaseNo"); + String flowName = CurPage.getParameter("FlowName"); + if("queryContract".equals(action)){ RightType = "ReadOnly"; } @@ -22,7 +24,17 @@ //获取页面属性liux系统暂时不支持 /* Toolkit toolkit = Toolkit.getDefaultToolkit(); Dimension screen = toolkit.getScreenSize(); */ - + + String falg = "false"; + + if("0010".equals(PhaseNo) || "0020".equals(PhaseNo) ){ + falg = "true"; + } + + if("合同制作流程".equals(flowName)){ + falg = "false"; + } + ASObjectModel doTemp = new ASObjectModel(sTempletNoQuery); // doTemp.appendHTMLStyle("FULLNAME","width:"+(int)((screen.getWidth()-(screen.getWidth()*0.108))*0.15)+"px;"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); @@ -41,9 +53,9 @@ }; } else{ sButtons=new String[][]{ - {"true","","Button","新增","新增","newRecord()","","","","btn_icon_add"}, - {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, - {"true","","Button","删除","删除","do_delete()","","","","btn_icon_delete"}, + {falg,"","Button","新增","新增","newRecord()","","","","btn_icon_add"}, + {falg,"","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, + {falg,"","Button","删除","删除","do_delete()","","","","btn_icon_delete"}, {"true","","Button","详情","详情","viewAndEdit2()","","","","btn_icon_edit"} }; } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index d13557373..e6699ff83 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -22,7 +22,18 @@ String custype = CurPage.getParameter("CustomerType"); String customertype = CurPage.getParameter("customertype"); String channel = CurPage.getParameter("channel"); - + String flowName = CurPage.getParameter("FlowName"); + + String falg = "false"; + + if("0010".equals(sPhaseNo) || "0020".equals(sPhaseNo) ){ + falg = "true"; + } + + if("合同制作流程".equals(flowName)){ + falg = "false"; + } + ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setHtmlEvent("inputTel","onChange","checkTel"); //租赁形式set只读 @@ -60,7 +71,7 @@ dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")); dwTemp.replaceColumn("customer_info", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { - {"ReadOnly".equals(rightType)?"false":"true","","Button","保存","保存","save()","","","","btn_icon_saveNew",""}, + {falg,"","Button","保存","保存","save()","","","","btn_icon_saveNew",""}, {"true","","Button","资料清单","资料清单","openFileList('1')","","","","btn_icon_saveNew",""}, {("BusinessApplyFlow".equals(FlowNo)||"BusinessChangeFlow".equals(FlowNo))&&("0030".equals(sPhaseNo)||"0040".equals(sPhaseNo)||"0050".equals(sPhaseNo)||"0060".equals(sPhaseNo)||"0070".equals(sPhaseNo))?"true":"false","","Button","信审资料","信审资料","openFileList('2')","","","","btn_icon_saveNew",""} }; diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp index 8f73b2ba4..5ce85d2a3 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp @@ -17,10 +17,16 @@ String IsHistory = CurPage.getParameter("IsHistory"); if(sPrevUrl == null) sPrevUrl = ""; - String falg = "true"; + String falg = "false"; + + if("0010".equals(sPhaseNo) || "0020".equals(sPhaseNo) ){ + falg = "true"; + } + if("合同制作流程".equals(flowName)){ falg = "false"; } + String sTempletNo = "CustomerFamilyJoinTempInfo";//--模板号-- //如果是合同查询则 查询正式表数据 if("flow_contract_sum_car".equals(showtype)){ diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 0f067c42a..ecf50004e 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -998,6 +998,7 @@ + diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java index 4c15d0a36..9e3fe7726 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java @@ -300,6 +300,9 @@ public class InsertCustomerHistoryInfo { //客户敞口计算 Transaction sqlca = Transaction.createTransaction(tx); BigDecimal exposureMoney = LBBusinessPrimary.obtainExposureMoney(sqlca,flowunid); + if(exposureMoney==null||"".equals(exposureMoney)){ + exposureMoney = BigDecimal.valueOf(0); + } //录入客户历史信息表 String ssql = "insert into customer_history_info_temp(id,customerid,customername,certtype,certid,customertype,customer_num,flowunid,project_id,clientbuynumber,clientfinancingamount,clientclosedaccount,clientunsettled,clientvehiclepopulation,clientclosedvehicle,clientoutstandingvehicle,clientloanbalance,clientoverdueamount,jointlybuynumber,jointlyfinancingamount,jointlyclosedaccount,jointlyunsettled,jointlyveh,jointlyclosedvehicle,jointlyout,jointlyloanbalance,jointlyoverdueamount,guaranteebuynumber,guaranteefin,guaranteeclosedaccount,guaranteeunsettled,guaranteeveh,guaranteeclosedvehicle,guaranteeout,guaranteeloanbalance,guaranteeoverdueamount,exposure)"+ "VALUES(replace(uuid(),'-',''),'"+customerinfo.get(i).get("customerid")+"','"+customerinfo.get(i).get("customername")+"','"+customerinfo.get(i).get("certtype")+"','"+customerinfo.get(i).get("certid")+"','"+customerinfo.get(i).get("customertype")+"','"+customerinfo.get(i).get("customer_num")+"','"+flowunid+"','"+customerinfo.get(i).get("project_id")+"','"+gmnum+"','"+CLEAN_LEASE_MONEY+"','"+jq_number+"','"+wjq_number+"','"+carnumber+"','"+carjqnumber+"','"+carwjqnumber+"','"+czr_rent_over+"','"+czr_yqrent_over+"',"+ diff --git a/src_jbo/jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java b/src_jbo/jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java index 8275c65a5..ed04471f7 100644 --- a/src_jbo/jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java +++ b/src_jbo/jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java @@ -82,4 +82,9 @@ public interface VI_CUSTOMERHISTORY { */ public static final String PROJ_NAME = "PROJ_NAME"; + /** + * 流程编号 STRING(32)
+ */ + public static final String FLOWUNID = "FLOWUNID"; + } diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java index 376f905c7..21337cfa0 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java @@ -159,15 +159,18 @@ public class CustomerInfoCheck { if(mobileFT!=null){ return "承租人跟共同申请人手机号重复！"; } - }else if("Lessee1".equals(CustomerName)){ - if(mobileFT!=null){ - return "紧急联系人1跟共同申请人手机号重复！"; - } - }else if("Lessee2".equals(CustomerName)){ - if(mobileFT!=null){ - return "紧急联系人2跟共同申请人手机号重复！"; - } - }else if("Lessee3".equals(CustomerName)){ + } +// else if("Lessee1".equals(CustomerName)){ +// if(mobileFT!=null){ +// return "紧急联系人1跟共同申请人手机号重复！"; +// } +// } +// else if("Lessee2".equals(CustomerName)){ +// if(mobileFT!=null){ +// return "紧急联系人2跟共同申请人手机号重复！"; +// } +// } + else if("Lessee3".equals(CustomerName)){ if(mobileFT!=null&&!(mobileFT.getAttribute("ID").getString().equals(certId))){ return "配偶跟共同申请人手机号重复！"; } @@ -178,42 +181,42 @@ public class CustomerInfoCheck { return "手机号跟承租人手机号重复！"; } } - else if(emergencycontacttel!=null){ - String id = emergencycontacttel.getAttribute("ID").getString(); - if(!id.equals(certId)){ - return "手机号跟紧急联系人1手机号重复！"; - } - } - else if(remark!=null){ - String id = remark.getAttribute("ID").getString(); - if(!id.equals(certId)){ - return "手机号跟紧急联系人2手机号重复！"; - } - } +// else if(emergencycontacttel!=null){ +// String id = emergencycontacttel.getAttribute("ID").getString(); +// if(!id.equals(certId)){ +// return "手机号跟紧急联系人1手机号重复！"; +// } +// } +// else if(remark!=null){ +// String id = remark.getAttribute("ID").getString(); +// if(!id.equals(certId)){ +// return "手机号跟紧急联系人2手机号重复！"; +// } +// } /*if(mobileLUT!=null){ String id = mobileLUT.getAttribute("ID").getString(); if(!id.equals(certId)){ return "手机号跟担保人手机号重复！"; } }*/ - if(mobileFT!=null){ - String id = mobileFT.getAttribute("ID").getString(); - if(!id.equals(certId)){ - return "手机号跟共同申请人手机号重复！"; - } - } - if(mobileFTSpouse!=null){ - String id = mobileFTSpouse.getAttribute("ID").getString(); - String certid1 = mobileFTSpouse.getAttribute("certid").getString();// 配偶身份证号 - String name = mobileFTSpouse.getAttribute("name").getString();// 配偶名称 - - // 判断担保人名称和身份证是否与配偶相同， 相同则过滤， 不同则提示 - if(certid1.equals(certid) && name.equals(FULLNAME)){ - return "SUCCESS"; - }else{ - return "手机号跟配偶人手机号重复！"; - } - } +// if(mobileFT!=null){ +// String id = mobileFT.getAttribute("ID").getString(); +// if(!id.equals(certId)){ +// return "手机号跟共同申请人手机号重复！"; +// } +// } +// if(mobileFTSpouse!=null){ +// String id = mobileFTSpouse.getAttribute("ID").getString(); +// String certid1 = mobileFTSpouse.getAttribute("certid").getString();// 配偶身份证号 +// String name = mobileFTSpouse.getAttribute("name").getString();// 配偶名称 +// +// // 判断担保人名称和身份证是否与配偶相同， 相同则过滤， 不同则提示 +// if(certid1.equals(certid) && name.equals(FULLNAME)){ +// return "SUCCESS"; +// }else{ +// return "手机号跟配偶人手机号重复！"; +// } +// } } } }