anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提前结清可以选择第一期之前的日期

Browse Source
This commit is contained in:
tangft 2019-02-18 17:06:01 +08:00
parent 84a5755892
commit 6acb7bdfcd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calc/com/tenwa/reckon/executor/RentCalHelper.java
View File

@ -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){