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

1.手工扣款输入校验bug修改和提示信息修改

Browse Source
This commit is contained in:
zhangbb 2020-08-29 16:46:33 +08:00
parent 10e9b661bc
commit 8d02e6ecd2
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
View File

@ -70,7 +70,6 @@
var sParm_id = getItemValueArray(0,"id");
var sParm_money = getItemValueArray(0,"collect_money");
var sParm_rent = getItemValueArray(0,"rent");
var sParm_penalty = getItemValueArray(0,"penalty");
if(typeof(sParm_id) == "undefined" || sParm_id.length == 0 ){
alert("请至少选择一条记录！");
return;
@ -84,13 +83,11 @@
ids = sParm_id[0];
collect_moneys = sParm_money[0];
var rent_moneys = sParm_rent[0];
var penalty_moneys = sParm_penalty[0];
var sum_moneys = eval(rent_moneys+"+"+penalty_moneys);
if(collect_moneys==""||collect_moneys==0){
alert("所选扣款金额不能为空或者为0！");
return;
}
if(sum_moneys*100<collect_moneys*100){
if(rent_moneys*100<collect_moneys*100){
alert("扣款金额不能大于租金加罚息金额");
return;
}
@ -102,8 +99,7 @@
alert("所选扣款金额不能为空或者为0！");
return;
}
var sum_moneyi = eval(sParm_rent[i]+"+"+sParm_penalty[i])
if(sum_moneyi*100<sParm_money[i]*100){
if(sParm_rent[i]*100<sParm_money[i]*100){
alert("扣款金额不能大于租金加罚息金额");
return;
}
@ -119,11 +115,11 @@
alert(value[1]);
return;
}
//是否正在执行定时任务校验
//是否正在执行定时任务校验（jobName为定时任务id）
var jobName = "f1e947de8bc9447fba53775f8aa3ca7f";
var result_ir = RunJavaMethod("com.tenwa.collectaudit.cache.CollectAuditInfoCache", "isRunning", "jobName="+jobName);
if(result_ir=="using"){
alert("定时任务正在执行，请稍后再试。");
alert("扣款定时任务正在自动执行，请稍后再试。");
return;
}
//校验当天扣款次数
@ -149,8 +145,6 @@
}else{
alert("未查询到对应的主体方法！");
}
location.reload();
}
}

4
src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java vendored
View File

@ -149,7 +149,7 @@ public class CollectAuditInfoCache {
String batchstatus = bo.getAttribute("BATCH_STATUS").toString();
String rent = bo.getAttribute("rent").toString();
if ("process".equals(batchstatus)) {//判断是否在批量处理中
return "error@"+name+"的"+plan_list+"日期为"+plan_date+"的租金正在进行批量扣款处理中".trim();
return "error@"+name+"的"+plan_list+"日期为"+plan_date+"的租金正在进行扣款处理中，请稍后".trim();
}
if ("".equals(rent) || "0".equals(rent) || "0.0".equals(rent)) {//判断剩余收款金额
return "error@"+name+"的"+plan_list+"日期为"+plan_date+"的租金已经全部收取,无法再次扣款".trim();
@ -859,7 +859,7 @@ public class CollectAuditInfoCache {
}
singleBatchCollectMoeny(tx, bolist);
}
return "系统正在处理中，请稍后";
return "发起扣款申请成功！";
}
/**
* 检查定时任务是否正在运行