Merge branch 'develop_ebank' into release20211231

This commit is contained in:
jiahuabin 2024-11-27 09:08:33 +08:00
commit 46a4fe4c75
2 changed files with 19 additions and 2 deletions

View File

@ -0,0 +1,16 @@
<%@ page import="com.tenwa.jbo.manager.DataUtil" %>
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/IncludeBeginMDAJAX.jsp"%><%
String paymentNumber = CurPage.getParameter("paymentNumber");
String planList = CurPage.getParameter("planList");
//获取选择期次前所有的剩余租金的和如果租金余额大于0则返回false禁止跨期核销
String rentOver = DataUtil.getValueBySql("select sum(rent_over) from vi_rent_collect_4_ebank where payment_number = '"+paymentNumber+"' and plan_list < '"+planList+"';");
double doubleRentOver = Double.parseDouble(rentOver);
String result = "";
if(doubleRentOver>0){
result = "false";
}else{
result = "true";
}
out.println(result);
%><%@ include file="/IncludeEndAJAX.jsp"%>

View File

@ -163,12 +163,13 @@
}
}
}
if(!flag){
var rentOverResult = AsControl.RunJsp("/Tenwa/Lease/Flow/Rent/RentIncome/GetBeforeRentOver.jsp","paymentNumber="+paymentNumber+"&planList="+thisPlanList);
if(!flag && rentOverResult=="false"){
alert("操作失败,不允许隔期回笼,请重新选择!");
$("input[onclick='checkInputData("+i+")']").removeAttr("checked");
return false;
}
if(!cancelFlag){
if(!cancelFlag && rentOverResult=="false"){
alert("操作失败,不允许隔期回笼,请重新选择!");
$("input[onclick='checkInputData("+i+")']").prop("checked","true");
return false;