From c74d289fa56c0a12d1842309c9a0e53ffc67f603 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Wed, 31 Oct 2018 10:09:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BA=E7=BB=8F=E9=94=80=E5=95=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=84=E9=87=91=E5=AE=9E=E6=94=B6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rentcollection/FundIncomeReport.jsp | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/FundIncomeReport.jsp diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/FundIncomeReport.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/FundIncomeReport.jsp new file mode 100644 index 000000000..052947e87 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/FundIncomeReport.jsp @@ -0,0 +1,41 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-10-30 + Content: + History Log: + */ + String userid=CurUser.getUserID(); + //String username=CurUser.getUserName(); + ASObjectModel doTemp = new ASObjectModel("FundIncomeReport"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + //doTemp.appendJboWhere(" and ui.USERID='"+userid+"'"); + //doTemp.appendJboWhere(" and ui.USERNAME='"+username+"'"); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(userid); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From 81c21e5b1899c4df7efc968cb48c66426be246ca Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 31 Oct 2018 10:47:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3--?= =?UTF-8?q?=E9=93=B6=E8=A1=8C=E7=A7=91=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractOnhireVoucher.java | 1 - .../auxiliaryInfo/auxiliaryContractAcc.java | 33 +++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index a360a6a37..532c30535 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -36,7 +36,6 @@ public class ContractOnhireVoucher extends BaseBussiness { cvld.CreateVoucher(FlowUnid, "PZ2018071000000009",Sqlca);// 收取客户手续费（按月分摊收入）--回租 cvld.CreateVoucher(FlowUnid, "PZ2018080300000073",Sqlca);// 收取客户手续费（按月分摊收入）--直租 - return "true"; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java index 8ce32a434..d3ebdc553 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java @@ -14,23 +14,22 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class auxiliaryContractAcc implements VoucherJavaParamService { -@Override -public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { - MapreturnValue=new HashMap(); - String ACC_NUMBER=param.get("ACC_NUMBER"); - returnValue.put("ACC_NUMBER",ACC_NUMBER); - BizObject bo=null; - try { - bo=JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME, tx) - .createQuery("acc_title=:ACC_NUMBER").setParameter("ACC_NUMBER", ACC_NUMBER).getSingleResult(false); - if(bo!=null){ - returnValue.put("F6",bo.getAttribute("acc_title").toString()); + public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + MapreturnValue=new HashMap(); + String ACC_NUMBER=param.get("ACC_NUMBER"); + returnValue.put("ACC_NUMBER",ACC_NUMBER); + String FbSdk="Y"; + String state_="0010"; + BizObject bo=null; + try { + // 将银行账号与本方账号的银行号做匹配, 获取科目 + bo=JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME, tx).createQuery("FbSdk=:FbSdk and state_=:state_").setParameter("FbSdk", FbSdk).setParameter("state_", state_).getSingleResult(false); + if(bo!=null){ + returnValue.put("F6",bo.getAttribute("acc_title").toString()); + } + } catch (JBOException e) { + e.printStackTrace(); } - } catch (JBOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + return returnValue; } - return returnValue; -} }