From c8abfacbd68638a599d94ab28bf2aaa06f13f57f Mon Sep 17 00:00:00 2001
From: xiezhiwen <xiezhiwen@xiezhiwen-PC>
Date: Mon, 18 Feb 2019 10:07:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3,=20?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BE=85=E5=8A=A9=E8=B4=A6null=E5=80=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateVoucherProcess/CreateVoucherContractTerminate.java  | 4 ++++
 .../CreateVoucherProcess/auxiliaryInfo/auxiliaryFundType.java | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java
index b4fa45f0b..64f8034a0 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java
@@ -153,6 +153,10 @@ public class CreateVoucherContractTerminate {
 	        		if("PZ2018081700000134".equals(VOUCHERNO)) {
 	        			param.put("BUSINESSTYPE", "0605");// 主营类型
 	        		}
+	        		// 将当月利息转收入
+	        		if("PZ2018081700000129".equals(VOUCHERNO)) {
+	        			param.put("BUSINESSTYPE", "0604");// 主营类型
+	        		}
             		param.put("CASHFLOW", "");// 现金流项目
 	        	}
 	        	
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryFundType.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryFundType.java
index 1dca04c9c..d29250759 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryFundType.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryFundType.java
@@ -13,8 +13,7 @@ public class auxiliaryFundType implements VoucherJavaParamService {
 public Map<String, String> getJavaParam(JBOTransaction tx,
 		Map<String, String> param,Map<String, String> subData) throws BusinessException {
 	Map<String,String>returnValue=new HashMap<String,String>();
-	String FUNDTYPE=param.get("FUNDTYPE");
-	returnValue.put("FUNDTYPE",FUNDTYPE);
+	returnValue.put("1","1");
 	return returnValue;
 }
 }