From 56f55402f4521cb04053e49ed68bf2414fad30a8 Mon Sep 17 00:00:00 2001 From: hexiaomou Date: Tue, 26 Jun 2018 20:06:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=98=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActualPayment/ActualPaymentTempList.jsp | 2 +- .../fund/flowpayment/FactObjectCheck.java | 33 ++----------------- .../LBCustomerTempToFormalBusiness.java | 28 ++++++++-------- 3 files changed, 17 insertions(+), 46 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp index 962458071..8617fb75d 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp @@ -51,7 +51,7 @@ }else{ sButtons = new String[][]{ {"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_save",""}, - {"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_delete",""} + //{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_delete",""} }; } %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> diff --git a/src_tenwa/com/tenwa/flow/fund/flowpayment/FactObjectCheck.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/FactObjectCheck.java index b6378ab3d..1a85f49bf 100644 --- a/src_tenwa/com/tenwa/flow/fund/flowpayment/FactObjectCheck.java +++ b/src_tenwa/com/tenwa/flow/fund/flowpayment/FactObjectCheck.java @@ -26,37 +26,8 @@ public class FactObjectCheck extends DefaultBussinessCheck { List bos = JBOFactory.getBizObjectManager(LC_FUND_INCOME_TEMP.CLASS_NAME).createQuery("flowunid=:flowunid and settle_method<>'settlemethod11'") .setParameter("flowunid", flowunid).getResultList(false); if(bos.size() > 0){ - String message = "请填写"; - boolean flag = true; - for(BizObject bo:bos){ - String factObject = bo.getAttribute("fact_object").getString(); - String clientBank = bo.getAttribute("client_bank").getString(); - if("settlemethod11".equals(bo.getAttribute("settle_method").getString())){ - if("".equals(factObject) && "".equals(clientBank)){ - message += "投放编号为【"+bo.getAttribute("payment_number").getString()+"】编号为【"+bo.getAttribute("plan_list").getInt()+"】的【"+CodeCache.getItemName("SettleMethod", bo.getAttribute("settle_method").getString())+"】的支付对象和对方银行信息！"; - flag = false; - }else if("".equals(clientBank)){ - message += "投放编号为【"+bo.getAttribute("payment_number").getString()+"】编号为【"+bo.getAttribute("plan_list").getInt()+"】的【"+CodeCache.getItemName("SettleMethod", bo.getAttribute("settle_method").getString())+"】的对方银行信息！"; - flag = false; - } - }else{ - if("".equals(factObject) && "".equals(clientBank)){ - message += "投放编号为【"+bo.getAttribute("payment_number").getString()+"】编号为【"+bo.getAttribute("plan_list").getInt()+"】的【"+CodeCache.getItemName("FeeType", bo.getAttribute("fee_type").getString())+"】的支付对象和对方银行信息！"; - flag = false; - }else if("".equals(clientBank)){ - message += "投放编号为【"+bo.getAttribute("payment_number").getString()+"】编号为【"+bo.getAttribute("plan_list").getInt()+"】的【"+CodeCache.getItemName("FeeType", bo.getAttribute("fee_type").getString())+"】的对方银行信息！"; - flag = false; - } - } - - } - if(flag){ - putMsg("信息填写正常！"); - setPass(true); - }else{ - putMsg(message); - setPass(false); - } + putMsg("信息填写正常！"); + setPass(true); }else{ putMsg("未生成本次付款！"); setPass(false); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java index b936ff558..06065550f 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java @@ -95,13 +95,13 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness { cust.setAttributeValue("certtype",cert.getAttribute("certtype").getString()); cust.setAttributeValue("certid",cert.getAttribute("certid").getString()); } - String inputorgid = bo.getAttribute("inputorgid").toString(); - if(inputorgid.startsWith("8006")) { - BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",inputorgid).getSingleResult(false); - if(distributor_bo!=null) { - cust.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no")); - } - } +// String inputorgid = bo.getAttribute("inputorgid").toString(); +// if(inputorgid.startsWith("8006")) { +// BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",inputorgid).getSingleResult(false); +// if(distributor_bo!=null) { +// cust.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no")); +// } +// } cust.setAttributeValue("inputuserid",bo.getAttribute("inputuserid")); cust.setAttributeValue("inputorgid",bo.getAttribute("inputorgid")); cust.setAttributeValue("inputtime",bo.getAttribute("inputtime")); @@ -163,13 +163,13 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness { cust.setAttributeValue("certtype",cert.getAttribute("certtype").getString()); cust.setAttributeValue("certid",cert.getAttribute("certid").getString()); } - String inputorgid = bo.getAttribute("inputorgid").toString(); - if(inputorgid.startsWith("8006")) { - BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",inputorgid).getSingleResult(false); - if(distributor_bo!=null) { - cust.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no")); - } - } +// String inputorgid = bo.getAttribute("inputorgid").toString(); +// if(inputorgid.startsWith("8006")) { +// BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",inputorgid).getSingleResult(false); +// if(distributor_bo!=null) { +// cust.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no")); +// } +// } cust.setAttributeValue("inputuserid",bo.getAttribute("inputuserid")); cust.setAttributeValue("inputorgid",bo.getAttribute("inputorgid")); cust.setAttributeValue("inputtime",bo.getAttribute("inputtime"));