Merge branch 'release20210415' into dailyfix
This commit is contained in:
gityjf
commit
886f78ea04
@ -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' );
|
||||
|
||||
@ -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;");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<%@ include file="/Frame/resources/include/include_end.jspf"%>
|
||||
@ -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<String, Map<String, String>> productRevenue = tcb.getProductRevenues();
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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','','','','');
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user