From ea61ad57fe7567e044d7d35b2016427691d0a350 Mon Sep 17 00:00:00 2001
From: zhulianghua <zhulh@tenwa.com.cn>
Date: Tue, 18 Sep 2018 11:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E9=83=A8=E6=94=B6?=
 =?UTF-8?q?=E7=9B=8A=E7=8E=87=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calc/com/tenwa/reckon/bean/TabCalBean.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/calc/com/tenwa/reckon/bean/TabCalBean.java b/calc/com/tenwa/reckon/bean/TabCalBean.java
index 98546fbbb..081e15232 100644
--- a/calc/com/tenwa/reckon/bean/TabCalBean.java
+++ b/calc/com/tenwa/reckon/bean/TabCalBean.java
@@ -325,9 +325,12 @@ public class TabCalBean {
 					}
 				}
 				//收益核算
-				Map<String,Map<String,String>> IRRmap=ProductParamUtil.getProductComponentType(this.getProductId(), "PRD0309");
-				if(IRRmap.containsKey("SYHS")&&IRRmap.get("SYHS")!=null&&IRRmap.get("SYHS").get("SYHS")!=null&&!IRRmap.get("SYHS").get("SYHS").equals("")){
-					cb.setIrrType(IRRmap.get("SYHS").get("SYHS"));
+				//Map<String,Map<String,String>> IRRmap=ProductParamUtil.getProductComponentType(this.getProductId(), "PRD0309");
+				String irrType = ProductParamUtil.getProductParameterValue(productId, "PRD0350", "SYHS", "SYHS");
+				if("".equals(irrType) || irrType == null) {
+					cb.setIrrType("STAGE_IRR");
+				} else {
+					cb.setIrrType(irrType);
 				}
 				//日期处理
 				Map<String,Map<String,String>> datemap=ProductParamUtil.getProductComponentType(this.getProductId(), "PRD0340");