From 4bf64b4b7ef9dfe23be68acfb3f75b9613e464e2 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Mon, 19 Nov 2018 17:33:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=E4=BF=9D=E5=8D=95=E6=94=BE=E6=AC=BE?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=BB=8F=E9=94=80=E5=95=86=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82=202.=E4=BB=98=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=90=88=E5=90=8C=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8B=85=E4=BF=9D=E4=BA=BA=E9=87=8D=E6=94=B9=E3=80=82=203.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD=E7=94=B7=E5=A5=B3=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBGuaranteePerUnitInfo.jsp | 3 +- .../LBGuaranteePerUnitListForContract.jsp | 38 +++++++++++++++++++ .../FundPayment/LCFundPaymentTempInfo.jsp | 7 ++++ .../CautionMoneyDeduction/ContractInfoPay.jsp | 5 ++- 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitListForContract.jsp diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp index c1fd8dbc5..0d6102458 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp @@ -206,12 +206,13 @@ } //根据身份证号判断性别 function ValidityCheck(){ + debugger; var certID = getItemValue(0,getRow(),"CERTID"); sex = certID.substring(16,17); sex = parseInt(sex); if(sex%2==0){//奇男偶女 setItemValue(0,getRow(),"SEX","2"); - }else{ + }else(sex%2==1){ setItemValue(0,getRow(),"SEX","1"); } checkCertidRepeat(); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitListForContract.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitListForContract.jsp new file mode 100644 index 000000000..283183991 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitListForContract.jsp @@ -0,0 +1,38 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-11-19 + Content: + History Log: + */ + String contractid = CurPage.getParameter("ContractId"); + ASObjectModel doTemp = new ASObjectModel("GuarantorQueryListForContract"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(contractid); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + // {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + // {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + // {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp index 73503aa0f..640026077 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp @@ -7,6 +7,7 @@ */ String ishistory = CurPage.getParameter("IsHistory"); String flowunid = CurPage.getParameter("FlowUnid"); + String phaseNo = CurPage.getParameter("PhaseNo"); ASObjectModel doTemp = new ASObjectModel("LCFundPaymentTempInfo"); /* if(null!=ishistory&&ishistory.equals("true")){ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory"); @@ -27,6 +28,12 @@ $(function(){ if(relines<0){ $("#RELINES").css("color","red"); } + var phaseNo="<%=phaseNo%>"; + if(phaseNo=='0010'){ + setItemReadOnly(0, 0, "LENDING_TYPE", true); + }else{ + setItemReadOnly(0, 0, "LENDING_TYPE", false); + } lendingType(); }); function lendingType(){ diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 05f4eb075..079f8e842 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -8,6 +8,7 @@ String ishistory = CurPage.getParameter("IsHistory"); String flowunid = CurPage.getParameter("FlowUnid"); String contractId = CurPage.getParameter("ContractId"); + String compClientID = CurPage.getParameter("CompClientID"); String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'"); String sTempletNo = "LB_CONTRACT_INFO_PAY";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); @@ -18,7 +19,8 @@ dwTemp.Style = "2"; dwTemp.ReadOnly = "1"; dwTemp.genHTMLObjectWindow(contractId); - + String url="/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitListForContract.jsp?CompClientID="; + dwTemp.replaceColumn("GUARANTEE_LIST", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { }; sButtonPosition = "south"; @@ -26,6 +28,7 @@ diff --git a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java index 87e659832..62cbb7732 100644 --- a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java +++ b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java @@ -27,6 +27,7 @@ public class CreditBodyGuardAction { private String flowunid; private String phaseno; + private String certids; public String getFlowunid() { return flowunid; @@ -43,13 +44,31 @@ public class CreditBodyGuardAction { public void setPhaseno(String phaseno) { this.phaseno = phaseno; } + + public String getCertids() { + return certids; + } + + public void setCertids(String certids) { + this.certids = certids; + } public String doCreditVerification(JBOTransaction tx) throws JBOException{ try { BizObjectManager bom1 = JBOFactory.getBizObjectManager(VI_LB_CAR_CREDIT_INVESTIGATION.CLASS_NAME, tx); BizObjectManager bom2 = JBOFactory.getBizObjectManager(LB_CAR_CREDIT_RISKITEM_TEMP.CLASS_NAME, tx); BizObjectManager bom3 = JBOFactory.getBizObjectManager(LB_CAR_CREDIT_PERSONAL_INFO_TEMP.CLASS_NAME,tx); - //查询借款人 + String newCertids = certids.replaceAll("@", "','"); + @SuppressWarnings("unchecked") + List guarantorResultList = bom1.createQuery("SELECT "+ + "fullName,"+ + "phoneNumber,"+ + "certId,"+ + "relation "+ + "FROM "+ + "O WHERE flowunid=:FLOWUNID "+ + " AND O.certId in ('"+newCertids+" ') ").setParameter("FLOWUNID",flowunid).getResultList(false); + /*//查询借款人 BizObject borrowerResult = bom1.createQuery("SELECT "+ "fullName,"+ "phoneNumber,"+ @@ -76,17 +95,17 @@ public class CreditBodyGuardAction { "relation "+ "FROM "+ "O WHERE flowunid=:FLOWUNID " - + "AND O.relation = '共同申请人'").setParameter("FLOWUNID", flowunid).getSingleResult(false); + + "AND O.relation = '共同申请人'").setParameter("FLOWUNID", flowunid).getSingleResult(false);*/ BodyGuardApiInvoker bodyGuardApiInvoker = new BodyGuardApiInvoker(); String personArr = ""; //获取到的所有人员信息对象存入personList中 List personList = new ArrayList<>(); - if(borrowerResult != null){ + /*if(borrowerResult != null){ personList.add(borrowerResult); } if(coborrowerResult != null){ personList.add(coborrowerResult); - } + }*/ if(guarantorResultList.size()>0){ for(BizObject biz : guarantorResultList){ personList.add(biz); @@ -114,8 +133,9 @@ public class CreditBodyGuardAction { } } //判断alreadypersonList的大小,若和personList相同，则说明全部执行过信贷校验，否则重新执行 - if(alreadypersonList.size() == personList.size()){ - return "征信校验已执行过,不可重复执行"; + //if(alreadypersonList.size() == personList.size()){ + if(alreadypersonList.size()>0){ + return "已选数据中有征信校验已执行过,请重新选择数据！"; //否则为没有执行过的执行信贷校验 }else{ //遍历failedpersonList并查询Info表,二次校验查看在此次流程阶段是否已经执行信贷校验 @@ -599,20 +619,20 @@ public class CreditBodyGuardAction { personArr = "'"+personArr.replaceAll(",", "','")+"'"; @SuppressWarnings("unchecked") List resultList = bom3.createQuery("select CERTID,MOBILE from O where O.CERTID not in ("+personArr+") AND flowunid=:FLOWUNID").setParameter("FLOWUNID",flowunid).getResultList(false); - if(resultList.size()>0){ + /* if(resultList.size()>0){ //组装成一个字符串 String afterPersonArr = ""; for(int q = 0;q Date: Tue, 20 Nov 2018 11:29:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B1=85=E4=BD=8F=E5=9C=B0=E6=9C=89?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=EF=BC=8C=E4=B8=8D=E5=9B=9E=E6=98=BE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/Flow/Project/BusinessApplication/CustomerAddress.jsp | 2 ++ .../Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerAddress.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerAddress.jsp index e361d2804..b439ad05e 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerAddress.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerAddress.jsp @@ -92,6 +92,8 @@ var isnew = getItemValue(0,getRow(),"isnew");//是否最新 var addtype = getItemValue(0,getRow(),"addtype");//地址类型 var id = getItemValue(0,getRow(),"id"); + var dressdetail = getItemValue(0,0,"dressdetail"); + setItemValue(0,0,"dressdetail",dressdetail); setItemValue(0,0,"fulladdress",getItemValue(0,0,"provincename")+getItemValue(0,0,"dressdetail")); setItemValue(0,0,"flowunid","<%=flowunid%>"); if(flag == "edit"){ diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index ccbc4e746..2d8f6b39a 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -539,7 +539,7 @@ var fulladdress = getItemValue(0,getRow(0),'fulladdress'); var country = getItemValue(0,getRow(0),'country'); var province = getItemValue(0,getRow(0),'province'); - var dressdetail = getItemValue(0,getRow(0),'dressdetail'); + var dressdetail = getItemValue(0,getRow(0),'dressdetail').replace(/[\r\n]/g,""); var zipcode = getItemValue(0,getRow(0),'zipcode'); var provincename = getItemValue(0,getRow(0),'provincename'); var flag = "edit"; From 322662429456a8c34fa75ae5de864bfcbd1ec2c6 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 20 Nov 2018 11:34:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0JBO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_sys.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml index bdbc99ad0..34988d486 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml @@ -1823,6 +1823,7 @@ + From 0ded85a0a8ee3bf1765ed57d75774b999e827f57 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 20 Nov 2018 11:50:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=8B=85=E4=BF=9D?= =?UTF-8?q?=E4=BA=BA=E6=80=A7=E5=88=AB=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp index 0d6102458..f8ac361ee 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp @@ -206,14 +206,16 @@ } //根据身份证号判断性别 function ValidityCheck(){ - debugger; + var certType = getItemValue(0,getRow(0),"CERTTYPE"); var certID = getItemValue(0,getRow(),"CERTID"); - sex = certID.substring(16,17); + var sex = certID.substring(16,17); sex = parseInt(sex); - if(sex%2==0){//奇男偶女 - setItemValue(0,getRow(),"SEX","2"); - }else(sex%2==1){ - setItemValue(0,getRow(),"SEX","1"); + if(certType=="Ind01"||certType=="Ind08"){ + if(sex%2==0){//奇男偶女 + setItemValue(0,getRow(),"SEX","2"); + }else if(sex%2==1){ + setItemValue(0,getRow(),"SEX","1"); + } } checkCertidRepeat(); }