From f9bb431bafcf6569884a0de6a3415ea830810ccc Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 11 Dec 2019 20:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E7=BB=AD=E8=B4=B9=E7=8E=87=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E7=BB=88=E6=AD=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PoundageMaintenanceInfo.jsp | 13 ++++++++++--- .../PoundageMaintenanceList.jsp | 10 +++++++--- .../Fund/ActualPayment/VIActualFundPlanList.jsp | 14 ++++++++------ .../controller/group/CheckPoundegeDate.java | 12 ++++++++++-- .../flow/fund/flowpayment/SubmitAgainLabel.java | 7 +++++-- 5 files changed, 40 insertions(+), 16 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp index 64078e7c5..c4e1f688c 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp @@ -11,8 +11,14 @@ doTemp.setHtmlEvent("expiry_date", "onchange", "isEndTime"); doTemp.setHtmlEvent("start_date", "onchange", "isStartTime"); if(Id!=null){ - doTemp.setReadOnly("start_date",true);//先把页面所有字段设为只读状态 - doTemp.setReadOnly("expiry_date",true);//先把页面所有字段设为只读状态 + String sql = "SELECT id FROM LPOUNDAGE_MAINTENANCE WHERE charge_channel='"+CurPage.getParameter("chargeChannel")+"' AND charge_way='"+CurPage.getParameter("chargeWay")+"' AND DATE_FORMAT("+CurPage.getParameter("startDate")+",'%Y/%m/%d') diff --git a/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java b/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java index 237099820..e5c971c81 100644 --- a/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java +++ b/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java @@ -15,6 +15,7 @@ public class CheckPoundegeDate { private String chargeWay;//扣款方式 private String startDate;//开始时间 private String expiryDate;//结束时间 + private String id; public String getChargeChannel() { return chargeChannel; } @@ -39,19 +40,26 @@ public class CheckPoundegeDate { public void setExpiryDate(String expiryDate) { this.expiryDate = expiryDate; } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + //校验扣款手续费维护日期 public String checkPoundegeDate(JBOTransaction tx) throws Exception{ Conn conn = new Conn(tx); String sql = "SELECT id FROM LPOUNDAGE_MAINTENANCE where charge_channel=? AND charge_way=? AND DATE_FORMAT(expiry_date,'%Y/%m/%d')>DATE_FORMAT(?,'%Y/%m/%d')"; List> results = conn.executeQuery(sql, chargeChannel,chargeWay,startDate); - if(results.size()>0){ + if(id==null &&results.size()>0){ return "开始时间大于已有数据的结束时间！！"; } String endSql = "SELECT a.expiry_date FROM LPOUNDAGE_MAINTENANCE AS a WHERE expiry_date = (SELECT MAX(expiry_date) FROM LPOUNDAGE_MAINTENANCE WHERE a.charge_channel=charge_channel AND a.charge_way=charge_way) and a.charge_channel=? AND a.charge_way=?"; List> endtime = conn.executeQuery(endSql, chargeChannel,chargeWay); - if(endtime.size()>0){ + if(id==null && endtime.size()>0){ String enddate = endtime.get(0).get("expiry_date"); DateFormat df = new SimpleDateFormat("yyyy/MM/dd"); Date startdate = df.parse(startDate); diff --git a/src_tenwa/com/tenwa/flow/fund/flowpayment/SubmitAgainLabel.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/SubmitAgainLabel.java index 79514b59e..3622d334f 100644 --- a/src_tenwa/com/tenwa/flow/fund/flowpayment/SubmitAgainLabel.java +++ b/src_tenwa/com/tenwa/flow/fund/flowpayment/SubmitAgainLabel.java @@ -35,9 +35,12 @@ public class SubmitAgainLabel extends BaseBussiness{ if( fbo!= null){ String proj_name = fbo.getAttribute("proj_name").toString(); if(proj_name.indexOf("再次提交")<0){ - fbo.setAttributeValue("proj_name", proj_name+"_再次提交"); - fboManage.saveObject(fbo); + fbo.setAttributeValue("proj_name", proj_name+"_"+resultList.size()+"次提交"); + }else{ + fbo.setAttributeValue("proj_name", proj_name.substring(0,proj_name.indexOf("次提交")-1)+resultList.size()+"次提交"); } + + fboManage.saveObject(fbo); } }