From 5477fce05157228aa4a2bbeab9cdc17ea165c293 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 4 Jul 2018 11:11:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BA=A7=E5=93=81=E8=A7=84=E6=A0=BC=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=A7=E5=93=81=E9=80=82=E7=94=A8=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E3=80=82=202.=E5=B8=A6=E5=87=BA=E5=90=88?= =?UTF-8?q?=E5=90=8C=E8=B5=B7=E7=A7=9F=E5=95=86=E5=8A=A1=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E4=BA=A7=E5=93=81=E5=90=8D=E7=A7=B0=E3=80=82=203.?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3=E7=A7=9F=E9=87=91=E6=B5=8B?= =?UTF-8?q?=E7=AE=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Accounting/LoanSimulation/LoanBasicInfo.jsp | 14 +++++++++++--- .../Accounting/LoanSimulation/condition_plan.jsp | 4 ++-- WebContent/WEB-INF/etc/jbo/jbo_prd.xml | 1 + .../reckon/executor/FundFundPlanExecutor.java | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 39be75602..71e4ea43a 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -10,6 +10,10 @@ <%@ page import="java.util.Vector" %> <%@ page import="com.amarsoft.awe.dw.ui.validator.ValidateRule" %> <%@ page import="com.tenwa.reckon.product.ASObjectWindowCalc" %> +<%@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 contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_info.jspf"%> <% @@ -17,7 +21,6 @@ String flowunid = CurPage.getParameter("FlowUnid"); String plannumber=CurPage.getParameter("plannumber"); String productId=CurPage.getParameter("ProductId"); - String productName = CurPage.getParameter("ProductName"); String ishistory=CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); String RightType= CurPage.getParameter("RightType"); @@ -152,6 +155,10 @@ dwTemp.replaceColumn("even_subsection", "", CurPage.getObjectWindowOutput()); dwTemp.replaceColumn("knowing_config", "", CurPage.getObjectWindowOutput()); String businessDate = DateHelper.getBusinessDate(); + //获取产品名称 + BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productID") + .setParameter("productID", productId).getSingleResult(false); + String productName = bo.getAttribute("typename").getString(); String sButtons[][] = { //{"true","All","Button","重置","重置","reloadSelf()","","","",""}, {"true","","Button","租金测算","租金测算","saveRecord()","","","","btn_icon_save"}, @@ -170,6 +177,7 @@ $(function(){ isFina(); //document.getElementById('div_my0').innerHTML = '
'+document.getElementById('div_my0').innerHTML+'
'; if("ReadOnly"!="<%=RightType%>"){ + debugger; rentOrRateOption=$("#RENT_OR_RATE").children(); incomeNumberYear=$("#INCOME_NUMBER_YEAR").children(); adjustType=$("#ADJUST_TYPE").children(); @@ -194,9 +202,9 @@ $(function(){ CalcControl.RentOrRateView(); count++; - }else{ + }else{ changeSettleMethod3(); - } + } }); function isFina(){ var fundRules=calcRules["fund"]; diff --git a/WebContent/Accounting/LoanSimulation/condition_plan.jsp b/WebContent/Accounting/LoanSimulation/condition_plan.jsp index 51276fd61..5fa5ecfa4 100644 --- a/WebContent/Accounting/LoanSimulation/condition_plan.jsp +++ b/WebContent/Accounting/LoanSimulation/condition_plan.jsp @@ -13,8 +13,8 @@ //参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是) String sTabStrip[][] = { {"true", "租金计划", "/Accounting/LoanSimulation/RentPlanList.jsp",params, "", "", "false"}, - //{"true", "资金计划", "/Accounting/LoanSimulation/FundPlanList.jsp",params, "", "", "false"}, - //{"true", "现金流", "/Accounting/LoanSimulation/CashFlowList.jsp",params, "", "", "false"}, + {"true", "资金计划", "/Accounting/LoanSimulation/FundPlanList.jsp",params, "", "", "false"}, + {"true", "现金流", "/Accounting/LoanSimulation/CashFlowList.jsp",params, "", "", "false"}, }; %> <%@ include file="/Resources/CodeParts/Tab01.jsp"%> diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml index 41ffc93e2..31fd6bd83 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml @@ -77,6 +77,7 @@ + diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java index 2c79bf64b..56c6d9948 100644 --- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java +++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java @@ -94,8 +94,8 @@ public class FundFundPlanExecutor { ffcp.setPayCust(custid); } fundPlanBeans.add(ffcp); - if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资 - if(con.getAttribute(entry.getKey().split("_")[0]+"_FINAN").getString().equals("N")) + if(StringUtil.nullToString(param.get("FINA")).equals("Y")){//需要判断是否融资 + if(con.getAttribute(entry.getKey()).getString().equals("N")) { FundPlanBean ffcp2 = new FundPlanBean(); ffcp2.setFeeType(item.getAttribute("itemno").getString());//费用类型