From 8d02e6ecd2868f4c20d2535343d76e6b4ff63cb1 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Sat, 29 Aug 2020 16:46:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=8B=E5=B7=A5=E6=89=A3=E6=AC=BE=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A0=A1=E9=AA=8Cbug=E4=BF=AE=E6=94=B9=E5=92=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LcReviewAuditRentPlanByHandleList.jsp          | 14 ++++----------
 .../collectaudit/cache/CollectAuditInfoCache.java  |  4 ++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
index 98f7c51c5..b7fa4b250 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
@@ -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(); 
 		}
 	}
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index 02109774f..a9edb02eb 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -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 "发起扣款申请成功！";
 	}
 	/**
 	 * 检查定时任务是否正在运行