From 6acb7bdfcd7b2471559db1d41878f153afcd922e Mon Sep 17 00:00:00 2001
From: tangft <32189@DESKTOP-M6TAG3K>
Date: Mon, 18 Feb 2019 17:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=89=8D=E7=BB=93=E6=B8=85=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E7=AC=AC=E4=B8=80=E6=9C=9F=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E7=9A=84=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calc/com/tenwa/reckon/executor/RentCalHelper.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/calc/com/tenwa/reckon/executor/RentCalHelper.java b/calc/com/tenwa/reckon/executor/RentCalHelper.java
index 99f0281af..02899ae9f 100644
--- a/calc/com/tenwa/reckon/executor/RentCalHelper.java
+++ b/calc/com/tenwa/reckon/executor/RentCalHelper.java
@@ -100,7 +100,8 @@ public class RentCalHelper {
 			Date max =  DateUtil.getTimeByFormat(maxdate, "yyyy/MM/dd");
 			Date min =  DateUtil.getTimeByFormat(mindate, "yyyy/MM/dd");
 			Date payDayAdjust = DateUtil.getTimeByFormat(this.paydayAdjust, "yyyy/MM/dd");
-			if(payDayAdjust.compareTo(min) >= 0 && payDayAdjust.compareTo(max) <= 0){
+//			if(payDayAdjust.compareTo(min) >= 0 && payDayAdjust.compareTo(max) <= 0){
+			if(payDayAdjust.compareTo(max) <= 0){
 				//约定终止日不能落在已汇款的租金计划的区间段
 				checkSql = "select max(rp.plan_date) maxdate from LC_RENT_PLAN rp  left join lc_rent_income ci on rp.id=ci.plan_id where ci.id is not null and rp.contract_id = ? and rp.payment_number=?";
 				results = conn.executeQuery(checkSql, this.contractId,this.paymentnumber);
@@ -118,7 +119,8 @@ public class RentCalHelper {
 				}
 			}else{
 				jsonObject.appendElement("result", "false");
-				jsonObject.appendElement("msg","预定终止日应不能大于最后一期租金支付日期，也不能小于第一期租金支付日期！！！");
+//				jsonObject.appendElement("msg","预定终止日应不能大于最后一期租金支付日期，也不能小于第一期租金支付日期！！！");
+				jsonObject.appendElement("msg","约定终止日应不能大于最后一期租金支付日期！！！");
 			}
 		}catch(Exception e){
 			tx.rollback();
@@ -213,11 +215,11 @@ public class RentCalHelper {
 			if(detailInfo.size()>0){
 				String planDate=detailInfo.get("plandate");
 				BigDecimal fistCorpus= new BigDecimal(detailInfo.get("fist_corpus"));
-				long numberDay=DateUtils.DateDays(this.paydayAdjust, planDate);
+//				long numberDay=DateUtils.DateDays(this.paydayAdjust, planDate);
 				BizObject bo=bm.createQuery(" select * from O where contract_id=:contract_id").setParameter("contract_id", this.contractId).getSingleResult(false);
 				BigDecimal yearRate= new BigDecimal(bo!=null?bo.getAttribute(LC_CALC_CONDITION.YEAR_RATE).toString():"");
-				BigDecimal repaymentInterest=fistCorpus.multiply(yearRate).divide(new BigDecimal(360), 20, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(numberDay));
-				jsonObject.appendElement("REPAYMENT_INTEREST", repaymentInterest.setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+//				BigDecimal repaymentInterest=fistCorpus.multiply(yearRate).divide(new BigDecimal(360), 20, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(numberDay));
+//				jsonObject.appendElement("REPAYMENT_INTEREST", repaymentInterest.setScale(2, BigDecimal.ROUND_HALF_UP).toString());
 			}
 			return JSONEncoder.encode(jsonObject);
 		}catch(Exception e){