From c9124fff006e99afdd0a0c4bb16d482039e56954 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 11 Jan 2019 11:21:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=9E=E9=99=85=E4=BB=98=E6=AC=BE=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B7=BB=E5=8A=A0=E6=94=BE=E6=AC=BE=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=88=E7=BA=BF=E4=B8=8A=E4=BB=98=E6=AC=BE=EF=BC=8C=E7=BA=BF?= =?UTF-8?q?=E4=B8=8B=E4=BB=98=E6=AC=BE=EF=BC=8C=E6=97=A0=E7=8E=B0=E9=87=91?= =?UTF-8?q?=E6=94=AF=E5=87=BA=EF=BC=89=E3=80=82=202.=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E4=B8=8D=E8=B5=B0=E4=BB=98=E6=AC=BE=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=94=BE=E6=AC=BE=E6=88=90=E5=8A=9F=E3=80=82?= =?UTF-8?q?=203.=E6=97=A0=E7=8E=B0=E9=87=91=E6=94=AF=E4=BB=98=E4=B8=8D?= =?UTF-8?q?=E8=B5=B0=E4=BB=98=E6=AC=BE=E6=8E=A5=E5=8F=A3=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=94=BE=E6=AC=BE=E6=88=90=E5=8A=9F=EF=BC=8C=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA=E6=97=A0=E7=8E=B0?= =?UTF-8?q?=E9=87=91=E6=94=AF=E5=87=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActualPaymentTempListBySubtotal1.jsp | 3 ++- .../Flow/Fund/ActualPayment/VIActualFundPlan.jsp | 5 +++-- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 2 +- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 3 ++- .../fund/fundcollection/FundIncomeMethod.java | 16 ++++++++++++++++ 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp index bb78e597e..0bb311d10 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp @@ -14,6 +14,7 @@ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory"); } */ String IS_FLOWING = Sqlca.getString(new SqlObject("select IS_FLOWING from lc_fund_income_temp where flowunid='"+flowunid+"'")); + String payType = Sqlca.getString(new SqlObject("SELECT payType FROM LC_FUND_INCOME_TEMP_HXM WHERE flowunid='"+flowunid+"'")); doTemp.appendJboWhere("AND O.IS_FLOWING='"+IS_FLOWING+"'"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- @@ -34,7 +35,7 @@ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String[][] sButtons = null; - if("ReadOnly".equals(rightType)){ + if("ReadOnly".equals(rightType)||"0020".equals(payType)||"0030".equals(payType)){ sButtons = new String[][]{ }; }else if("0020".equals(phaseNo)){ diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlan.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlan.jsp index 9fa5bae2c..3194e31fd 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlan.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlan.jsp @@ -41,15 +41,16 @@ return; } var contractIds = ""; + var payType = getItemValue(0,rows[0],"payType"); for(var i in rows){ - if(getItemValue(0,rows[i],"payType")!=getItemValue(0,rows[0],"payType")){ + if(getItemValue(0,rows[i],"payType")!=payType){ AsDebug.showMessage("提示","每次只能生成放款方式相同的合同！","","",true); return; } contractIds += "@"+getItemValue(0,rows[i],"ID"); } contractIds = contractIds.substring(1); - var result = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","createActualPayment","contractIds="+contractIds+",flowunid=<%=flowunid%>,userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>"); + var result = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","createActualPayment","contractIds="+contractIds+",flowunid=<%=flowunid%>,userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>"+",payType="+payType); if("SUCCESS" == result){ AsDebug.showMessage("提示","操作成功！","","",true); reloadSelf(); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index e78b92129..f64bc40a3 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -3225,7 +3225,7 @@ - + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index c12f959fc..99020edf2 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3916,7 +3916,8 @@ - + + diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java index e38311bce..495080d5e 100644 --- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java @@ -42,6 +42,7 @@ public class FundIncomeMethod { private String userId; private String orgId; private String status; + private String payType; public String getIsChanged() { return isChanged; @@ -154,6 +155,13 @@ public class FundIncomeMethod { public void setStatus(String status) { this.status = status; } + public String getPayType() { + return payType; + } + + public void setPayType(String payType) { + this.payType = payType; + } public String getContactId(JBOTransaction tx) throws SQLException, Exception{ SqlObject s = new SqlObject("select customertype,contract_number,customer_id," @@ -374,6 +382,12 @@ public class FundIncomeMethod { otherProperty.put("ACC_NUMBER", boOA.getAttribute("ACC_NUMBER").getString()); otherProperty.put("INCOME_ID", bo.getAttribute("ID").getString()); otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "03"); + if("0020".equals(payType)||"0030".equals(payType)){ + otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "05"); + } + if("0030".equals(payType)){ + otherProperty.put(LC_FUND_INCOME.SETTLE_METHOD, "settlemethod13"); + } otherProperty.put("FACT_DATE", StringFunction.getToday()); DataOperatorUtil.copySingleJBO(LC_FUND_INCOME.CLASS_NAME, fromCondition,LC_FUND_INCOME_TEMP.CLASS_NAME, null, otherProperty,tx); } @@ -433,4 +447,6 @@ public class FundIncomeMethod { // double CerificationMoney= Double.valueOf(corpus)+Double.valueOf(interest)+Double.valueOf(penalty); return c.doubleValue()+""; } + + }