diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 3cc66ae89..63b3587e0 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -139,6 +139,16 @@ }else{ doTemp.setVisible("RENT_RATIO",false); } + + + if(CurUser.hasRole("401")){ + doTemp.setVisible("DISCOUNT", false); + // doTemp.setColumnAttribute("DISCOUNT","colvisible","0"); + } + if(CurUser.hasRole("800R00000013")||CurUser.hasRole("800R00000014")||CurUser.hasRole("800R00000015")){ + doTemp.setVisible("YEAR_RATE", true); + } + ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); diff --git a/WebContent/Accounting/LoanSimulation/RentPlanList.jsp b/WebContent/Accounting/LoanSimulation/RentPlanList.jsp index 5db469a03..f58de4d96 100644 --- a/WebContent/Accounting/LoanSimulation/RentPlanList.jsp +++ b/WebContent/Accounting/LoanSimulation/RentPlanList.jsp @@ -21,14 +21,13 @@ doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow"); } String Distributor=CurPage.getParameter("isDistributor"); + String orgid = CurUser.getOrgID(); if("true".equals(Distributor)||CurUser.hasRole("401")){ doTemp.setVisible("CORPUS", false); doTemp.setVisible("INTEREST", false); doTemp.setVisible("CORPUS_BUSINESS", false); doTemp.setVisible("INTEREST_BUSINESS", false); - } - String orgid = CurUser.getOrgID(); - if("8009012002".equals(orgid)){ + }else if(!"8009012002".equals(orgid)){ doTemp.setVisible("CORPUS", false); doTemp.setVisible("INTEREST", false); } diff --git a/WebContent/AppMain/Logon/logo_amarsoft.png b/WebContent/AppMain/Logon/logo_amarsoft.png index 85709ff78..b074b0a01 100644 Binary files a/WebContent/AppMain/Logon/logo_amarsoft.png and b/WebContent/AppMain/Logon/logo_amarsoft.png differ diff --git a/WebContent/AppMain/Logon/logo_amarsoft11111.png b/WebContent/AppMain/Logon/logo_amarsoft11111.png new file mode 100644 index 000000000..65af1c2d9 Binary files /dev/null and b/WebContent/AppMain/Logon/logo_amarsoft11111.png differ diff --git a/WebContent/AppMain/Logon/logo_amarsoft3.png b/WebContent/AppMain/Logon/logo_amarsoft3.png new file mode 100644 index 000000000..85709ff78 Binary files /dev/null and b/WebContent/AppMain/Logon/logo_amarsoft3.png differ diff --git a/WebContent/AppMain/Logon/logon.css b/WebContent/AppMain/Logon/logon.css index b5aed6825..e126935c6 100644 --- a/WebContent/AppMain/Logon/logon.css +++ b/WebContent/AppMain/Logon/logon.css @@ -11,10 +11,10 @@ body{ /*登录页面logo更换 高42px 宽213px 格式*/ .logo_pic{ float:left; - height:32px; + height:88px; width:213px; background:url(logo_amarsoft.png); - margin-top:280px; + margin-top:267px; margin-left:90px; display: inline; } diff --git a/WebContent/Frame/page/resources/images/main/logo.png b/WebContent/Frame/page/resources/images/main/logo.png index dde4f54c8..c7d34a52c 100644 Binary files a/WebContent/Frame/page/resources/images/main/logo.png and b/WebContent/Frame/page/resources/images/main/logo.png differ diff --git a/WebContent/Frame/page/resources/images/main/logo1111.png b/WebContent/Frame/page/resources/images/main/logo1111.png new file mode 100644 index 000000000..4a3837b3e Binary files /dev/null and b/WebContent/Frame/page/resources/images/main/logo1111.png differ diff --git a/WebContent/Frame/page/resources/images/main/logo3.png b/WebContent/Frame/page/resources/images/main/logo3.png new file mode 100644 index 000000000..dde4f54c8 Binary files /dev/null and b/WebContent/Frame/page/resources/images/main/logo3.png differ diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp index cebf3c50b..9e08c6616 100644 --- a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp +++ b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp @@ -28,7 +28,7 @@ }else if("proj".equals(type)){ otherWhere=" and O.proj_id='"+proj_id+"' order by O.INPUTTIME DESC"; }else if("contract".equals(type)){ - otherWhere=" and (O.contract_id='"+contract_id+"' OR O.proj_id='"+proj_id+"') order by O.INPUTTIME DESC"; + otherWhere=" and (O.contract_id='"+contract_id+"' OR O.proj_id='"+proj_id+"') "; } diff --git a/WebContent/Tenwa/Core/ChannelCRMManager/ChannelOrg/OrgTree.jsp b/WebContent/Tenwa/Core/ChannelCRMManager/ChannelOrg/OrgTree.jsp index 64966e860..3c9a4bda1 100644 --- a/WebContent/Tenwa/Core/ChannelCRMManager/ChannelOrg/OrgTree.jsp +++ b/WebContent/Tenwa/Core/ChannelCRMManager/ChannelOrg/OrgTree.jsp @@ -50,7 +50,7 @@ overflow: hidden; } -
+
<% String compClientID = request.getParameter("CompClientID"); @@ -68,7 +68,7 @@ jQuery(function(){ loadMask = new tracywindyLoadMask(document.body,"数据加载中 请稍后..."); } var height=$("body").height(); - $("#id_menu_tabs_menu").height((height-30) <= 0 ? "100%" : height-30); + $("#id_menu_tabs_menu").height(height-30 <=0 ? "100%": height-30); initDeptTree(sOrgId,""); }); diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunctionForTab.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunctionForTab.jspf index ee42abf22..c6d0c08f0 100644 --- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunctionForTab.jspf +++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunctionForTab.jspf @@ -114,7 +114,7 @@ function backStep(){ if("BusinessApplyFlow"==param["FlowNo"]){ if("0030,0040,0050".indexOf(param["PhaseNo"])>-1){ var sReturn = AsControl.RunJavaMethodTrans("com.tenwa.controller.LAElementConfigController","queryBusinessApproval","PhaseNo="+param["PhaseNo"]+",ObjectNo="+param["ObjectNo"]);//返回值: yes-有意见; no-无意见; error-查询出错 - if("0020"==sReturn){ + if("0070"==sReturn){ if (!confirm('已选择同意是否确实要退回')) return false; } } diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml index 08c20d88e..06e432e60 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml +++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml @@ -43,7 +43,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney, rlrp.plan_list AS rentlist, rlrp.plan_date AS plandate, rlrp.rent AS planmoney, - 'rent' AS renttype, + CONVERT('rent' USING utf8) AS renttype, invoiceinfo.interest_invoice_type AS rentinvoicetype, invoiceinfo.interest_rate AS rentrate, lccs.contract_id AS contractid @@ -81,7 +81,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney, LEFT JOIN (SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form ) invoiceinfo on lci.id= invoiceinfo.id - WHERE lci.rent_invoice_type in ('invoice_type03','invoice_type05') AND lccs.PLAN_STATUS>=31 + WHERE lccs.PLAN_STATUS>=31 UNION ALL SELECT clrp.id AS id, @@ -89,7 +89,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney, clrp.plan_list AS rentlist, clrp.plan_date AS plandate, clrp.corpus AS planmoney, - 'corpus' AS renttype, + CONVERT('corpus' USING utf8) AS renttype, invoiceinfo.corpus_invoice_type AS rentinvoicetype, invoiceinfo.corpus_rate AS rentrate, lccs.contract_id AS contractid @@ -128,7 +128,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney, (SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form where lci.sign_date>='2016/05/01' ) invoiceinfo on lci.id= invoiceinfo.id - WHERE lci.rent_invoice_type='invoice_type04' AND lccs.PLAN_STATUS>=31 + WHERE lccs.PLAN_STATUS>=31 UNION ALL SELECT ilrp.id AS id, @@ -136,7 +136,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney, ilrp.plan_list AS rentlist, ilrp.plan_date AS plandate, ilrp.interest AS planmoney, - 'interest' AS renttype, + CONVERT('interest' USING utf8) AS renttype, invoiceinfo.interest_invoice_type AS rentinvoicetype, invoiceinfo.interest_rate AS rentrate, lccs.contract_id AS contractid @@ -175,7 +175,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney, (SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form where lci.sign_date>='2016/05/01' ) invoiceinfo on lci.id= invoiceinfo.id - WHERE lci.rent_invoice_type IN ('invoice_type01','invoice_type02','invoice_type04','invoice_type06') AND lccs.PLAN_STATUS>=31 + WHERE lccs.PLAN_STATUS>=31 ) rentplan LEFT JOIN LB_CONTRACT_INFO lci ON rentplan.contractid=lci.id LEFT JOIN lb_contract_invoice_type lcit ON lcit.contract_id=lci.id AND lcit.is_main='Y' @@ -265,7 +265,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney, LEFT JOIN (SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form ) invoiceinfo on lci.id= invoiceinfo.id - WHERE lci.rent_invoice_type in ('invoice_type03','invoice_type05') AND lccs.PLAN_STATUS>=31 + WHERE lccs.PLAN_STATUS>=31 UNION ALL SELECT clrp.id AS id, @@ -312,7 +312,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney, (SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form where lci.sign_date>='2016/05/01' ) invoiceinfo on lci.id= invoiceinfo.id - WHERE lci.rent_invoice_type='invoice_type04' AND lccs.PLAN_STATUS>=31 + WHERE lccs.PLAN_STATUS>=31 UNION ALL SELECT ilrp.id AS id, @@ -359,7 +359,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney, (SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form where lci.sign_date>='2016/05/01' ) invoiceinfo on lci.id= invoiceinfo.id - WHERE lci.rent_invoice_type IN ('invoice_type01','invoice_type02','invoice_type04','invoice_type06') AND lccs.PLAN_STATUS>=31 + WHERE lccs.PLAN_STATUS>=31 ) rentplan LEFT JOIN LB_CONTRACT_INFO lci ON rentplan.contractid=lci.id LEFT JOIN lb_contract_invoice_type lcit ON lcit.contract_id=lci.id AND lcit.is_main='Y' diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp index 879921862..91997eddb 100644 --- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp @@ -17,7 +17,7 @@ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { - {"true","All","Button","验证银行卡信息","验证银行卡信息","verifyBankInfo()","","","","btn_icon_add",""} + {"false","All","Button","验证银行卡信息","验证银行卡信息","verifyBankInfo()","","","","btn_icon_add",""} //{"true","All","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_add",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp index 8cbb13819..f3c9c2eed 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp @@ -8,9 +8,9 @@ */ String flowunid = CurPage.getParameter("FlowUnid"); -String RightType = CurPage.getParameter("RightType");//选择模式 -String ishistory=CurPage.getParameter("IsHistory"); -String nodeNo=CurPage.getParameter("NodeNo"); + String RightType = CurPage.getParameter("RightType");//选择模式 + String ishistory=CurPage.getParameter("IsHistory"); + String nodeNo=CurPage.getParameter("NodeNo"); BizObject condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); String paymentnumber=condition.getAttribute("payment_number").getString(); @@ -78,6 +78,9 @@ String nodeNo=CurPage.getParameter("NodeNo"); setItemValue(0,getRow(),"REPURCHASE_RATIO","100"); //回购本金 setItemValue(0,getRow(),"REPURCHASE_MONEY",remaincorpus); + + setItemValue(0,getRow(),"FIST_RENT",terminateInfo.fist_rent); + } } @@ -128,6 +131,7 @@ String nodeNo=CurPage.getParameter("NodeNo"); jQuery(function(){ setItemValue(0,0,"flowunid","<%=flowunid%>"); + setItemValue(0,0,"PAYDAY_DATE","<%=StringFunction.getToday()%>"); //设置商定罚息带出逾期罚息 setItemValue(0,0,"AGREED_PENALTY",getItemValue(0,0,'DUN_PENALTY')); //判断其他应收和其他应退是否为空 diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp index 556efd8ac..1f23e7e52 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp @@ -11,7 +11,7 @@ String sTempletNo = "ActualPaymentBatchModify";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); if("0020".equals(phaseNo)){ - doTemp.setVisible("EBANK_STATUS", false); + //doTemp.setVisible("EBANK_STATUS", false); doTemp.setReadOnly("BANK", true); doTemp.setRequired("BANK", false); } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 8ed56050a..490aeaf5e 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -273,12 +273,12 @@ var secondchoice = getItemValue(0,0,"secondchoice"); if(secondchoice==""){ setItemRequired(0,"InterOpinion2",false); - setItemRequired(0,"DistriOpinion2",false); + //setItemRequired(0,"DistriOpinion2",false); $("#SECONDOPINION").removeAttr("disabled"); } if(secondchoice=="0020"){ setItemRequired(0,"InterOpinion2",true); - setItemRequired(0,"DistriOpinion2",false); + //setItemRequired(0,"DistriOpinion2",false); $("#SECONDOPINION").removeAttr("disabled"); var obj=document.getElementById('SECONDOPINION'); for(var i=0;i<7;i++){ @@ -289,7 +289,7 @@ if(secondchoice=="0010"){ setItemRequired(0,"A_div_1240",true); setItemRequired(0,"InterOpinion2",false); - setItemRequired(0,"DistriOpinion2",true); + //setItemRequired(0,"DistriOpinion2",true); $("#SECONDOPINION").removeAttr("disabled"); var obj=document.getElementById('SECONDOPINION'); for(var i=0;i<7;i++){ @@ -299,14 +299,14 @@ } if(secondchoice=="0030"){ setItemRequired(0,"InterOpinion2",false); - setItemRequired(0,"DistriOpinion2",true); + //setItemRequired(0,"DistriOpinion2",true); setItemRequired(0,"secondopinion",false); setItemValue(0,0,"secondopinion",""); $("#SECONDOPINION").attr("disabled","disabled"); } if(secondchoice=="0040"){ setItemRequired(0,"InterOpinion2",false); - setItemRequired(0,"DistriOpinion2",true); + //setItemRequired(0,"DistriOpinion2",true); setItemValue(0,0,"secondopinion",""); $("#SECONDOPINION").attr("disabled","disabled"); } @@ -317,13 +317,13 @@ var thirdchoice = getItemValue(0,0,"thirdchoice"); if(thirdchoice==""){ setItemRequired(0,"InterOpinion3",false); - setItemRequired(0,"DistriOpinion3",false); + //setItemRequired(0,"DistriOpinion3",false); $("#THIRDOPINION").removeAttr("disabled"); } if(thirdchoice=="0010"){ setItemRequired(0,"A_div_1260",true); setItemRequired(0,"InterOpinion3",false); - setItemRequired(0,"DistriOpinion3",true); + //setItemRequired(0,"DistriOpinion3",true); $("#THIRDOPINION").removeAttr("disabled"); var obj=document.getElementById('THIRDOPINION'); for(var i=0;i<7;i++){ @@ -333,7 +333,7 @@ } if(thirdchoice=="0020"){ setItemRequired(0,"InterOpinion3",true); - setItemRequired(0,"DistriOpinion3",false); + //setItemRequired(0,"DistriOpinion3",false); $("#THIRDOPINION").removeAttr("disabled"); var obj=document.getElementById('THIRDOPINION'); for(var i=0;i<7;i++){ @@ -343,14 +343,14 @@ } if(thirdchoice=="0030"){ setItemRequired(0,"InterOpinion3",false); - setItemRequired(0,"DistriOpinion3",true); + //setItemRequired(0,"DistriOpinion3",true); setItemRequired(0,"thirdopinion",false); setItemValue(0,0,"thirdopinion",""); $("#THIRDOPINION").attr("disabled","disabled"); } if(thirdchoice=="0040"){ setItemRequired(0,"InterOpinion3",false); - setItemRequired(0,"DistriOpinion3",true); + //setItemRequired(0,"DistriOpinion3",true); setItemValue(0,0,"thirdopinion",""); $("#THIRDOPINION").attr("disabled","disabled"); } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index 80570e570..009d9dfec 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -72,6 +72,7 @@ function changeChildrensNumber(){//已婚时显示配偶信息页面 var marriage = getItemValue(0,0,"MARRIAGE"); if("01" == marriage){ + setItemRequired(0, "childrens_number", true); $("#CHILDRENS_NUMBER").removeAttr("ReadOnly");//删除子女人数字段只读属性 $("#A_Group_0030").attr("style","display:block;"); changeFamilyRequired(); diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 9109e3804..c8e360f21 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -1085,7 +1085,7 @@ - + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 5e2937f14..bb3ad0f50 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -305,6 +305,13 @@ + + + + + + + @@ -345,6 +352,12 @@ + + + + + + diff --git a/WebContent/logon.html b/WebContent/logon.html index 7d341eb2e..79c8104a1 100644 --- a/WebContent/logon.html +++ b/WebContent/logon.html @@ -47,10 +47,10 @@
-
领先的融资租赁行业信息服务提供商
+
现代金融租赁服务企业
-
Copyright @2000-2018 Amarsoft all rights reserved.
+
diff --git a/calc/com/tenwa/reckon/executor/RentCalHelper.java b/calc/com/tenwa/reckon/executor/RentCalHelper.java index 2d2239c96..185c10d14 100644 --- a/calc/com/tenwa/reckon/executor/RentCalHelper.java +++ b/calc/com/tenwa/reckon/executor/RentCalHelper.java @@ -141,16 +141,16 @@ public class RentCalHelper { + " sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.remaininterest else 0 end ) remaininterest, " +" sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.corpus else 0 end ) remainfincorpus," +" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.interest else 0 end ) remainfininterest," - +" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') <= DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.overduerent else 0 end ) overduerent " + +" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') <= DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.overduerent else 0 end ) overduerent,min(t.rent*(12-t.cou)) fist_rent " + " from (" + " select " + " t1.corpus-ifnull(t2.sumincomecorpus,0) remaincorpus," + " t1.interestbusiness - ifnull(t2.sumincomeinterest,0) remaininterest," - + " t1.rent - ifnull(t2.sumincomerent,0) overduerent," + + " t1.rent - ifnull(t2.sumincomerent,0) overduerent, t1.rent," + " t1.corpus," + " t1.interest," + " t1.plandate," - + " t1.planlist" + + " t1.planlist,IFNULL(t2.cou,0) cou" + " from (" + " select cfrp.plan_date plandate," + " cfrp.plan_list planlist," @@ -168,7 +168,7 @@ public class RentCalHelper { + " ,sum(cfri.interest ) sumincomeinterest," + " sum( cfri.rent ) sumincomerent," + " min(cfri.contract_id) contractid," - + " cfri.plan_list planlist" + + " cfri.plan_list planlist,count(1) cou" + " from LC_RENT_INCOME cfri " + " where cfri.contract_id = ? and payment_number=?" + " group by cfri.plan_list" @@ -183,6 +183,7 @@ public class RentCalHelper { for(String key : detailInfo.keySet()){ jsonObject.appendElement(key, detailInfo.get(key)); } + System.out.println(jsonObject.toString()); return JSONEncoder.encode(jsonObject); }catch(Exception e){ tx.rollback(); @@ -199,8 +200,7 @@ public class RentCalHelper { */ public String getTerminateOtherInfo() throws Exception { JSONObject jsonObject = JSONObject.createObject(); - - String fundSql = "select t2.sumplanin-ifnull(t1.sumchargein,0) fundin,t2.sumplanout- ifnull(t1.sumchargeout,0) fundout from ( " + String fundSql = "select t2.sumplanin-ifnull(t1.sumchargein,0) fundin,t2.sumplanout- ifnull(t1.sumchargeout,0) fundout,max(lc.NOMINAL_PRICE) nominalprice from ( " + " select sum(case ffc.pay_type when 'pay_type_in' then ffc.fact_money else 0 end )sumchargein, " + " sum(case ffc.pay_type when 'pay_type_out' then ffc.fact_money else 0 end )sumchargeout, " + " min(ffc.contract_id) contractid,min(ffc.payment_number) paymentnumber " @@ -211,7 +211,7 @@ public class RentCalHelper { + " min(ffp.contract_id) contractid,min(ffp.payment_number) paymentnumber " + " from LC_FUND_PLAN ffp " + " where ffp.contract_id = ? and ffp.payment_number=?" - + " )t2 on t1.contractid = t2.contractid and t1.paymentnumber=t2.paymentnumber"; + + " )t2 on t1.contractid = t2.contractid and t1.paymentnumber=t2.paymentnumber left join lc_calc_condition lc on lc.CONTRACT_ID=t2.contractid"; if("ORACLE".equals(InitDBType.DBTYPE)){ fundSql=fundSql.replaceAll("ifnull", "nvl"); } @@ -224,9 +224,11 @@ public class RentCalHelper { Map fundMap = list.get(0); jsonObject.appendElement("OTHER_IN",fundMap.get("fundin")); jsonObject.appendElement("OTHER_OUT",fundMap.get("fundout")); + jsonObject.appendElement("NOMINAL_PRICE",fundMap.get("nominalprice")); }else{ jsonObject.appendElement("OTHER_IN","0"); jsonObject.appendElement("OTHER_OUT","0"); + jsonObject.appendElement("NOMINAL_PRICE","0"); } } catch (JBOException e) { tx.rollback(); diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java index af1837d76..08f07002d 100644 --- a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java +++ b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java @@ -147,11 +147,18 @@ public class CmbToCallbackController extends BaseFlowStartAction { callback_detail_bo.setAttributeValue("RTNNAR",callback_detail.getRTNNAR()); this.initTabeUserInfo(callback_detail_bo); callback_detail_bom.saveObject(callback_detail_bo); + String RTNFLG = callback_detail.getRTNFLG(); + String sql1=""; + if("S".equals(RTNFLG)){ + sql1 = "update O set O.EBANK_STATUS='05' where O.FLOWUNID='"+FLOWUNID+"'"; + }else{ + sql1 = "update O set O.EBANK_STATUS='04' where O.FLOWUNID='"+FLOWUNID+"'"; + } + JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql1).executeUpdate(); } map.put("code", "0") ; map.put("msg", "查询结果刷新成功") ; JSONObject jsonObj = JSONObject.fromObject(map); - sql(); return jsonObj.toString(); }else { sql(); @@ -179,7 +186,7 @@ public class CmbToCallbackController extends BaseFlowStartAction { public void sql() throws JBOException{ String sql2 = "update O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on lci.id=O.contract_id" +" left join jbo.com.tenwa.lease.comm.LC_FUND_INCOME_CALLBACK_DETAIL_TEMP tt on tt.DISTRIBUTOR_ID=lci.distributor_id" - +" and O.FLOWUNID=tt.FLOWUNID set O.EBANK_STATUS=case when tt.RTNFLG='S' then '05' else '04' end where O.FLOWUNID="+"'"+FLOWUNID+"'" ; + +" and O.FLOWUNID=tt.FLOWUNID set O.EBANK_STATUS=case when tt.RTNFLG='S' then '05' else '04' end where O.FLOWUNID='"+FLOWUNID+"'" ; JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql2).executeUpdate(); } } diff --git a/src_tenwa/com/tenwa/controller/LAElementConfigController.java b/src_tenwa/com/tenwa/controller/LAElementConfigController.java index 2343c8241..f0f782610 100644 --- a/src_tenwa/com/tenwa/controller/LAElementConfigController.java +++ b/src_tenwa/com/tenwa/controller/LAElementConfigController.java @@ -65,13 +65,13 @@ public class LAElementConfigController { BizObject bo = lleManager.createQuery("FLOWUNID=:FLOWUNID ").setParameter("FLOWUNID",this.getObjectNo()).getSingleResult(false); switch (this.getPhaseNo()) { case "0030": - meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.firstchoice).toString():"false"; + meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.firstopinion).toString():"false"; break; case "0040": - meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.secondchoice).toString():"false";; + meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.secondopinion).toString():"false";; break; case "0050": - meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.thirdchoice).toString():"false";; + meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.thirdopinion).toString():"false";; break; default: meagess="false"; diff --git a/src_tenwa/com/tenwa/flow/fund/actualpayment/CopyFundIncomeTempToFormalCar.java b/src_tenwa/com/tenwa/flow/fund/actualpayment/CopyFundIncomeTempToFormalCar.java index 7ed3e66d9..34c334f28 100644 --- a/src_tenwa/com/tenwa/flow/fund/actualpayment/CopyFundIncomeTempToFormalCar.java +++ b/src_tenwa/com/tenwa/flow/fund/actualpayment/CopyFundIncomeTempToFormalCar.java @@ -8,11 +8,14 @@ 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 jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS; 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.Transaction; +import com.amarsoft.context.ASUser; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.flow.baseBussion.BaseBussiness; /** @@ -25,10 +28,13 @@ public class CopyFundIncomeTempToFormalCar extends BaseBussiness{ public Object run(Transaction Sqlca) throws Exception{ this.initBussinessParam(Sqlca.getTransaction()); String sFlowUnid = (String)this.getAttribute("ObjectNo"); + String userId = this.getAttribute("CurUserID").toString(); + ASUser user = ASUser.getUser(userId, Sqlca); 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 bos = bomLFIT.createQuery("flowunid=:flowunid and pay_status<>'apply_return' and ebank_status='05' ").setParameter("flowunid", sFlowUnid).getResultList(false); + BizObjectManager bsbom = JBOFactory.getBizObjectManager(BUSINESS_STATUS.CLASS_NAME, Sqlca); if(bos.size() > 0){ for(BizObject bo:bos){ Map fromCondition = new HashMap(); @@ -45,6 +51,14 @@ public class CopyFundIncomeTempToFormalCar extends BaseBussiness{ otherProperty.put("ROLL_BACK", "0"); } DataOperatorUtil.copySingleJBO(LC_FUND_INCOME_TEMP.CLASS_NAME, fromCondition,LC_FUND_INCOME.CLASS_NAME, toCondition, otherProperty,Sqlca.getTransaction()); + BizObject bsbo = bsbom.newObject(); + String contractNumber = Sqlca.getString("select contract_number from lb_contract_info where id='"+bo.getAttribute(LC_FUND_INCOME_TEMP.CONTRACT_ID).getString()+"'"); + bsbo.setAttributeValue(BUSINESS_STATUS.contract_number, contractNumber); + bsbo.setAttributeValue(BUSINESS_STATUS.business_status, "41");//起租 + bsbo.setAttributeValue(BUSINESS_STATUS.inputuserid, user.getUserID()); + bsbo.setAttributeValue(BUSINESS_STATUS.inputorgid, user.getOrgID()); + bsbo.setAttributeValue(BUSINESS_STATUS.inputtime, StringFunction.getTodayNow()); + bsbom.saveObject(bsbo); } Map condition = new HashMap(); DataOperatorUtil.copySingleJBO(LB_ACTUAL_PAYMENT_INFO_TEMP.CLASS_NAME, condition,LB_ACTUAL_PAYMENT_INFO.CLASS_NAME, new HashMap(), new HashMap(),Sqlca.getTransaction()); diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java index ac1775f24..ae1313df8 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java @@ -73,7 +73,7 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{ //String projectName=projectNO+"_"+this.FlowParam.get("CustName")+this.FlowParam.get("ProductName")+"项目"; this.FlowParam.put("ProjectNo", projectNO);//项目编号 this.FlowParam.put("FlowKey", projectNO);//流程互斥 - this.FlowParam.put("ProjectName", projectNO);//项目名称 + this.FlowParam.put("ProjectName", projectNO+"-"+this.getCustname());//项目名称 this.FlowParam.put("carAttributes", this.getCarAttributes());//车辆属性 this.FlowParam.put("leasehold", this.getLeasehold());//租赁方式 this.FlowParam.put("productModel", this.getProductModel());//品牌