From c272a6c48f36d0376aab09a68b81ff22ef2d768f Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Fri, 26 Mar 2021 10:50:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=81=B5=E6=B4=BB=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=B5=8B=E7=AE=97=E6=97=B6=EF=BC=8C=E5=8F=AF=E4=BB=A50?= =?UTF-8?q?=E5=88=A9=E7=8E=87=EF=BC=8C=E7=A7=9F=E9=87=91=E7=AD=89=E4=BA=8E?= =?UTF-8?q?=E6=9C=AC=E9=87=91(=E5=BD=93=E6=B5=8B=E7=AE=97=E5=B9=B4?= =?UTF-8?q?=E5=88=A9=E7=8E=87=E5=92=8C=E6=B5=8B=E7=AE=97=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E4=B8=BA0=E6=97=B6=EF=BC=8C=E6=8C=890?= =?UTF-8?q?=E5=88=A9=E7=8E=87=EF=BC=8C=E5=BD=93=E5=88=A9=E7=8E=87=E6=9C=89?= =?UTF-8?q?=E5=80=BC=E6=97=B6=E5=88=99=E6=8C=89=E5=88=A9=E7=8E=87=E7=AE=97?= =?UTF-8?q?=E7=A7=9F=E9=87=91=EF=BC=8C=E5=BD=93=E7=A7=9F=E9=87=91=E6=9C=89?= =?UTF-8?q?=E5=80=BC=E4=B8=94=E5=88=A9=E7=8E=87=3D0=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E6=8C=89=E7=A7=9F=E9=87=91=E7=AE=97=E5=88=A9=E7=8E=87?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Accounting/LoanSimulation/LoanBasicInfo.jsp | 13 +++++++------ .../reckon/executor/CreateTransactionExecutor.java | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index dd0028db8..63cc2fde4 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -1157,13 +1157,14 @@ function saveRecord(sPostEvents){ if ( 'Y' === '<%=flexible%>' ) { var yearRate = getItemValue( 0, 0, 'YEAR_RATE' ); var rentValue = getItemValue( 0, 0, 'RENT_VALUE' ); - if ( Number( yearRate ) === 0 && Number( rentValue ) === 0 ) { - alert( '灵活产品下，请在测算年利率或预计租金中填值' ); + + if(yearRate>0 || ( Number( yearRate ) === 0 && Number( rentValue ) === 0 )){ + setItemValue( 0, 0, 'RENT_OR_RATE', 'rate' ); + }else if(rentValue>0 && Number( yearRate ) === 0 ){ + setItemValue( 0, 0, 'RENT_OR_RATE', 'rent' ); + }else{ + alert( '灵活产品下，测算年利率或预计租金不能为空或者小于0' ); return; - } else if ( Number( yearRate ) === 0 ) { - setItemValue( 0, 0, 'RENT_OR_RATE', 'rent' ); - } else { - setItemValue( 0, 0, 'RENT_OR_RATE', 'rate' ); } var cautionMoneyRatio = getItemValue( 0, 0, 'CAUTION_MONEY_RATIO' ); var firstPaymentRatio = getItemValue( 0, 0, 'FIRST_PAYMENT_RATIO' ); diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 26072cc6b..f6644f1e1 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -92,7 +92,7 @@ public class CreateTransactionExecutor implements Transaction { String yearRate = bean.getCb().getYearRate(); this.preHandle(bean.getCb(),bean); checkYearRate( bean.getCb(), bean, new BigDecimal( bean.getCb().getYearRate() ) );//当初理解错误，成本利率和年利率不一样 - if(bean.getCb().getRentOrRate().equals("rent")&&new BigDecimal(bean.getCb().getIncomeNumber()).multiply(new BigDecimal(bean.getCb().getRentValue())).compareTo(new BigDecimal(bean.getCb().getCleanLeaseMoney()))<=0){ + if(bean.getCb().getRentOrRate().equals("rent")&&new BigDecimal(bean.getCb().getIncomeNumber()).multiply(new BigDecimal(bean.getCb().getRentValue())).compareTo(new BigDecimal(bean.getCb().getCleanLeaseMoney()))<0){ throw new BusinessException("按租金算年利率租金总和不能小于融资额"); } bean.setProductType(productType); From 3f43e8d607114b0356b7078a8ebc8ce18fd81599 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 26 Mar 2021 13:34:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AD=E8=BD=A6=E7=9A=84=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=90=88=E5=90=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp | 9 +++++++++ src_sql/棰勬姇SQL/v20210415/tft20210415.sql | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 030538b3a..d844585c7 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -122,6 +122,15 @@ window.onload = function(){ $("#A_Group_0070").attr("style","display:none;");//隐藏 } changeNetCarInfo(); + //如果是中车合同，显示中车的合同号 + var channel = getItemValue(0,0,"channel"); + if("ZC" == channel){ + $("#A_div_1034").attr("style","display:block;"); + $("#A_div_1038").attr("style","display:block;"); + }else{ + $("#A_div_1034").attr("style","display:none;"); + $("#A_div_1038").attr("style","display:none;"); + } } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/src_sql/棰勬姇SQL/v20210415/tft20210415.sql b/src_sql/棰勬姇SQL/v20210415/tft20210415.sql index fa7f38297..ea3f08320 100644 --- a/src_sql/棰勬姇SQL/v20210415/tft20210415.sql +++ b/src_sql/棰勬姇SQL/v20210415/tft20210415.sql @@ -40,8 +40,10 @@ Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimaryk delete from SELECT_CATALOG where selname='SelectContract_Car_KE'; Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectContract_Car_KE','Sql','合同撤销选择框(汽车)(kaer)','','','Grid','String orgid','id,project_id,product_id,contract_no,custkind,customertype,car_type,leas_form,channel','SELECT lci.id,lult.project_id ,lci.product_id,lci.contract_no,lci.contract_number,lci.project_name,ci.customername,getItemName(''CertType'',ci.certtype) certtype,ci.certid,getItemName(''cust_kind'',lci.project_industry) as custkind,getUserName(lci.project_manage) as project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.car_type,lci.leas_form,lci.channel FROM LB_CONTRACT_INFO lci LEFT JOIN LB_UNION_LESSEE lult on lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci on lult.customer_id=ci.customerid where lult.is_main=''y'' and lci.businesstype = ''1'' and not EXISTS (select 1 from LC_CALC_CONDITION_STATUS ccs where ccs.contract_id=lci.id) and contract_status=''21'' {lci,contract} and lci.inputorgid=''#orgid'' order by lci.contract_number desc','合同id,项目id,产品编号,合同编号,业务合同编号,项目名称,客户名称,证件类别,证件号码,内部行业,业务经理,经销商渠道/名称,客户类型,车辆类型,租赁方法,渠道','project_name@style={width:350px;}','id@project_id@product_id@contract_number@project_name@customertype@car_type@leas_form@channel','project_name,customername','1','Single','','','','','','SYS_Designer','','2019/05/31 15:15:25','SYS_Designer','2021/03/21 14:32:20',''); - - +-- 付款申请添加中车申请号和中车合同号 +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_CONTRACT_INFO_PAY','1034','1034','1','O','ZC_PROJECT_NUMBER','ZC_PROJECT_NUMBER','String','','中车申请号','','1','Text','1','1','','','','32','1','0','0','1','0',0,'','0010','','SYS_Designer','2021/03/26 11:36:27','SYS_Designer','2021/03/26 11:42:57','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_CONTRACT_INFO_PAY','1038','1038','1','O','ZC_CONTRACT_NUMBER','ZC_CONTRACT_NUMBER','String','','中车合同号','','1','Text','1','1','','','','32','1','0','0','1','0',0,'','0010','','SYS_Designer','2021/03/26 11:36:27','SYS_Designer','2021/03/26 11:42:57','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_CONTRACT_INFO_PAY','6060','6060','1','O','CHANNEL','CHANNEL','String','','渠道','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','','','SYS_Designer','2021/03/26 11:36:27','SYS_Designer','2021/03/26 11:36:27','0','','1','','','',''); From b102cc5a476dd0f8f9ad43caaf4961ddf9955419 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 26 Mar 2021 15:09:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=B4=E6=81=AF=E5=8F=82=E4=B8=8EIRR?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/executor/CashFlowExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java index 482996878..61ad94304 100644 --- a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java +++ b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java @@ -127,7 +127,7 @@ public class CashFlowExecutor { sql +=" if(fundplan.pay_type='pay_type_in',fundplan.plan_money,-fundplan.plan_money) cleanfow " ; sql +=" from "+Tools.getTable(tcb.getFundFundPlan_tb())+" fundplan " ; sql +=" left join code_library tdd on fundplan.fee_type = tdd.itemno and tdd.codeno='FeeType' " ; - sql +=" where fundplan.flowunid = '"+ tcb.getDocId()+"' and fundplan."+tcb.getPlanCName()+"='"+tcb.getPlanCValue()+"' and fundplan.fee_type in ('feetype2','feetype1','feetype10','feetype16','feetype17') "; + sql +=" where fundplan.flowunid = '"+ tcb.getDocId()+"' and fundplan."+tcb.getPlanCName()+"='"+tcb.getPlanCValue()+"' and fundplan.fee_type in ('feetype2','feetype1','feetype10','feetype16','feetype17','feetype33') "; //如果是灵活产品减去产品中配置的GPS差额 if("Y".equals( cb.getFlexible() ) ){ Map> productRevenue = tcb.getProductRevenues();