diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 5b53386b1..961e38a03 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -13,7 +13,7 @@ <%@page import="com.amarsoft.are.jbo.BizObject"%> <%@page import="com.amarsoft.are.jbo.JBOException"%> <%@page import="com.amarsoft.are.jbo.JBOFactory"%> -<%@page import="com.amarsoft.are.jbo.JBOFactory"%> +<%@page import="jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP"%> <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_info.jspf"%> <% @@ -25,6 +25,7 @@ String nodeNo=CurPage.getParameter("NodeNo"); String RightType= CurPage.getParameter("RightType"); String calType = CurPage.getParameter("calType"); + String carAttributes = CurPage.getParameter("carAttributes"); //判断是否为汽车业务 boolean isCarProduct = "004".equals(productId) ? false : true; /*获取参数*/ @@ -96,6 +97,7 @@ doTemp.setHtmlEvent("DEFAULTDUEDAY", "onchange", "changeLeaseAmtDate"); doTemp.setHtmlEvent("FIRST_PLAN_DATE", "onchange", "changeFistPlanDate");//第一期计划日期 doTemp.setHtmlEvent("CORPUS_RATIO", "onchange", "changeCorpusRatio");//期限内本金比例 + doTemp.setHtmlEvent("EQUIP_AMT", "onchange", "changgeCompare");//车价 /*设置字段事件*/ /*设置模板属性*/ @@ -132,12 +134,10 @@ Parameter p=new Parameter("plannumber",plannumber); Vector v=CurPage.parameterList; v.add(p); - /*设置页面属性*/ - if(CurUser.hasRole("401")){ - doTemp.setVisible("CAUTION_MONEY_METHOD",false); - } - + /*设置页面属性*/ + boolean flag=CurUser.hasRole("401"); if(CurUser.hasRole("401")){ + doTemp.setVisible("CAUTION_MONEY_METHOD",false); doTemp.setVisible("DISCOUNT", false); // doTemp.setColumnAttribute("DISCOUNT","colvisible","0"); } @@ -172,6 +172,10 @@ BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productID") .setParameter("productID", productId).getSingleResult(false); String productName = bo.getAttribute("typename").getString(); + //获取对应车辆指导价 + BizObject bo1 = JBOFactory.createBizObjectQuery(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME,"flowunid=:flowunid") + .setParameter("flowunid",flowunid).getSingleResult(false); + String nowTotal = bo1.getAttribute("NOW_TOTAL").getString(); String sButtons[][] = { //{"true","All","Button","重置","重置","reloadSelf()","","","",""}, {"true","","Button","租金测算","租金测算","saveRecord()","","","","btn_icon_save"}, @@ -185,6 +189,7 @@ var incomeNumberYear; var adjustType; var count = 0; $(function(){ + changgeCompare(); var productName="<%=productName%>"; setItemValue(0,0,"PRODUCT_NAME",productName); //document.getElementById('div_my0').innerHTML = '
'+document.getElementById('div_my0').innerHTML+'
'; @@ -220,6 +225,14 @@ $(function(){ } getRatioByMoney(getObj(0, "EQUIP_AMT")); }); +function changgeCompare(){ + var nowTotal="<%=nowTotal%>"; + var equipAmt=getItemValue(0, 0, "EQUIP_AMT"); + var flag="<%=flag%>"; + if(equipAmt>nowTotal&&flag=="false"){ + $("#EQUIP_AMT").css("color","red"); + } +} function isFina(){ var fundRules=calcRules["fund"]; for(var key in fundRules){ diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp index 43b67dedf..8d5107430 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp @@ -64,6 +64,7 @@ } if("0020".equals(phaseNo)){ ado.setReadOnly("ACCOUNTING_DATE", false); + ado.setReadOnly("FACT_DATE", false); } if("0030".equals(phaseNo)){ ado.setReadOnly("ACCOUNTING_DATE", true); diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 572fc128f..05f4eb075 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -25,6 +25,7 @@ %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 7709ac373..70d53582d 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -199,6 +199,7 @@ public class CreateTransactionExecutor implements Transaction { String insertSql="insert into lc_rent_plan(id,quot_id,cust_id, project_id, project_plan_number,contract_id,contract_plan_number,payment_number,plan_list,plan_date,plan_status,rent,corpus,interest,penalty,corpus_business,interest_business,rent_adjust,all_remain_corpus,settle_method,coin,year_rate,memo,flowunid,inputuserid,inputorgid,inputtime,updateuserid,updateorgid,updatetime,interest_date) select id,quot_id,cust_id, project_id, project_plan_number,contract_id,contract_plan_number,payment_number,plan_list,plan_date,plan_status,rent,corpus,interest,penalty,corpus_business,interest_business,rent_adjust,all_remain_corpus,settle_method,coin,year_rate,memo,flowunid,inputuserid,inputorgid,inputtime,updateuserid,updateorgid,updatetime,interest_date from lc_pay_rent_plan where payment_number = '" + this.plannumber + "'"; Sqlca.executeSQL(new SqlObject(insertSql)); Connection conn = Sqlca.getConnection(Sqlca); + //实际租金计划日期（开始） PreparedStatement ps = conn.prepareStatement("update lc_rent_plan set plan_date = ? where payment_number = '" + this.plannumber + "' and plan_list = ?"); for(int i = 0; i < planDateList.size(); i ++) { ps.setString(1, planDateList.get(i)); @@ -211,6 +212,7 @@ public class CreateTransactionExecutor implements Transaction { if(planDateList.size()>0)boLCC.setAttributeValue("first_plan_date", planDateList.get(0)); if(planDateList.size()>1)boLCC.setAttributeValue("second_plan_date", planDateList.get(1)); Bm.saveObject(boLCC); + //实际租金计划日期（结束） Sqlca.executeSQL(new SqlObject("update lc_fund_plan set plan_date = '" + planDateList.get(planDateList.size() - 1) + "' where payment_number = '" + this.plannumber + "' and pay_type = 'pay_type_out' and fee_type != 'feetype10'")); Sqlca.executeSQL(new SqlObject("update lc_fund_plan set plan_date = '" + startDate + "' where payment_number = '" + this.plannumber + "' and pay_type = 'pay_type_in' and fee_type != 'feetype4' and fee_type != 'feetype12'")); Sqlca.executeSQL(new SqlObject("update lc_fund_plan set plan_date = '" + startDate + "' where payment_number = '" + this.plannumber + "' and fee_type = 'feetype10'"));