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

租金测算尾款为空判断处理

Browse Source
This commit is contained in:
zhouyahui 2018-09-11 12:32:21 +08:00
parent daac19a89f
commit daa5a7e62d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
View File

@ -157,7 +157,7 @@
String sButtons[][] = {
//{"true","All","Button","ÖØÖÃ","ÖØÖÃ","reloadSelf()","","","",""},
{"true","","Button","×â½ð²âËã","×â½ð²âËã","saveRecord()","","","","btn_icon_save"},
{((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"}
//{((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"}
};
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">

4
calc/com/tenwa/reckon/help/RentalServiceImpl.java
View File

@ -71,7 +71,7 @@ public class RentalServiceImpl {
if(cb.getRentOrRate() != null && cb.getRentOrRate().equals("rent")){
rent = cb.getRentValue().toString();
}else{
BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment());
BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment()==null?"0":cb.getFinalPayment());
if(finalPayment.compareTo(BigDecimal.ZERO) != 0) {
if(cb.getDeferStr()){
rent = new BigDecimal(RentTools.getPMT(preRate, cb.getIncomeNumber() + "", cleanLeaseMoney, "0", cb.getPeriodType())).toString();
@ -201,7 +201,7 @@ public class RentalServiceImpl {
* @return
*/
public List<String> getNormalRentList(ConditionBean cb, List<String> rent_list, String rent) {
BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment());
BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment()==null?"0":cb.getFinalPayment());
for (int i = 0; i < cb.getIncomeNumber(); i++) {
if(i == cb.getIncomeNumber() - 1 && finalPayment.compareTo(BigDecimal.ONE) != 0 && "final_payment_method02".equals(cb.getFinalPaymentMethod())) {
rent_list.add(finalPayment.add(new BigDecimal(rent)).toString());