From cc93cf91dfb8e06a8282b05d6c720cdef7f3ac00 Mon Sep 17 00:00:00 2001 From: amarsoft Date: Tue, 21 Aug 2018 09:52:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/App/Interface/Ebank/LCEbankList.jsp | 25 ++++++++- .../voucher/serviceImp/VoucherToV8Impl.java | 7 ++- .../com/tenwa/lease/app/ebank/EbankUse.java | 51 +++++++++++++++++++ 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp index 325b87fcf..87bfee1be 100644 --- a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp +++ b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp @@ -26,6 +26,9 @@ {"false","","Button","废弃","废弃","abandon()","","","","btn_icon_delete",""}, {"true","","Button","导入Excel","导入Excel","importExcel()","","","","btn_icon_import",""}, {"true","","Button","网银模版下载","网银模版下载","ebankDownload()","","","","btn_icon_down",""}, + {"true","","Button","确认收入","确认收入","confirmIncome()","","","","btn_icon_valid",""}, + {"true","","Button","确认退回","确认退回","confirmpayback()","","","","btn_icon_valid",""}, + /* {"true","","Button","导入Excel-平安","导入Excel-平安","importPAExcel()","","","","btn_icon_import",""}, {"true","","Button","导入Excel-光大","导入Excel-光大","importCEBExcel()","","","","btn_icon_import",""}, {"true","","Button","光大网银模版下载","光大网银模版下载","ebankCEBDownload()","","","","btn_icon_down",""}, */ @@ -84,8 +87,11 @@ importCondition["inputorgid"]="<%=department%>"; var sparam=JSON.stringify(importCondition).replace(/,/g,"@");//生成模板的参数据 AsDialog.PopView("/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcel.jsp","importparam="+sparam, - {width:"320px",height:"40px",title:"上传网银Excel"},function(){reloadSelf();}); + {width:"320px",height:"40px",title:"上传网银Excel"},function(){ + importExcelNew(); + reloadSelf();}); + } function importPAExcel(){ var importCondition={};//导入配置 @@ -142,5 +148,22 @@ } AsControl.OpenView(sUrl,'id=' +sPara ,'_self',''); } + function importExcelNew(){ + + var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createEbankVoucher",""); + + } + function confirmIncome(){ + var sPara = getItemValue(0,getRow(0),'id'); + if(typeof(sPara)=="undefined" || sPara.length==0 ){ + alert("参数不能为空！"); + return ; + } + var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+ebdataid); + + } + function confirmpayback(){ + + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index 639190ad9..63ff983d6 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -58,6 +58,7 @@ public class VoucherToV8Impl implements VoucherService { */ private static final String Receive_Dealer_Margin="回款-收到经销商保证金"; private static final String Return_Dealer_Margin="放款-退回经销商保证金"; + private static final String ebank_income="回款-银行存款转预收"; public String saveMessage(List> list,Map param,BizObject user,JBOTransaction tx) throws Exception{ try{ @@ -88,12 +89,14 @@ public class VoucherToV8Impl implements VoucherService { String contracid=list.get(i).get("CONTRACT_ID");//合同号 String modularNumber=param.get("MODULAR_NUMBER");//凭证编号 //网银导入、代收租金 的凭证不需要合同号 - if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber) && Tools.isNullOrEmpty(contracid)){ + if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) + && !SPECIAL_MODULENAME.equals(modularNumber) && !ebank_income.equals(modularNumber)&& Tools.isNullOrEmpty(contracid) + ){ log.error("合同号为空,无法构建对应的凭证信息!"); return null; } //检查合同ID是否是正确的 - if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){ + if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&& !ebank_income.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){ BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "id=:id").setParameter("id", contracid).getSingleResult(false); if(contract==null){ message = message + "合同信息为空!"; diff --git a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java index 46a607fe3..4c9c52699 100644 --- a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java +++ b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java @@ -1,16 +1,23 @@ package com.tenwa.lease.app.ebank; +import java.util.HashMap; import java.util.List; +import java.util.Map; import jbo.app.tenwa.calc.LC_EBANK; import jbo.app.tenwa.calc.LC_EBANK_PROCESS; import jbo.app.tenwa.calc.LC_EBANK_TEMP; +import jbo.voucher.LV_VOUCHER_CONFIG; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.BizObjectQuery; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; public class EbankUse { private String ebdataid; @@ -46,4 +53,48 @@ public class EbankUse { ebankbom.createQuery(sql).setParameter("invalid", "Y").setParameter("id", this.getEbdataid()).executeUpdate(); return "success"; } + + public void createEbankVoucher(JBOTransaction tx) throws Exception{ + Transaction Sqlca =null; + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + String voucherNo="PZ2018081600000120"; + Map param=new HashMap(); + BizObjectManager ebankbom=JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME); + tx.join(ebankbom); + String fact_money=""; + String fact_date=""; + String ownnumber=""; + List bolist=ebankbom.createQuery("DEBIT_MONEY IS NULL").getResultList(true); + CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); + String VOUCHER_TYPE="1";// 凭证分类 金蝶 + String userid ="admin"; + for(BizObject bo:bolist){ + fact_money=bo.getAttribute("fact_money").getString(); + fact_date=bo.getAttribute("fact_date").getString(); + ownnumber=bo.getAttribute("ownacc_number").getString(); + + param.put("FACT_MONEY",fact_money); + param.put("ACCOUNT_DATE",fact_date); + param.put("FACT_DATE",fact_date); + param.put("ACC_NUMBER",ownnumber); + + Map map=new HashMap(); + map.put("PROJ_TYPE", "02"); + map.put("VOUCHER_NO", voucherNo); + BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + if(vouch!=null){ + vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid,param, Sqlca); + } + bo.setAttributeValue("DEBIT_MONEY",fact_money); + ebankbom.saveObject(bo); + } + Sqlca.commit(); + } + + public void createLeftEbankIncomeVoucher(JBOTransaction tx) throws Exception{ + BizObjectManager ebankbom=JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME); + tx.join(ebankbom); + BizObject bo=ebankbom.createQuery("id=:id").setParameter("id", this.getEbdataid()).getSingleResult(true); + + } } From ecaf21feb57f6f2de01b8ccd9c2bc908db16aa1a Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 21 Aug 2018 10:41:24 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=A7=9F=E9=87=91=E5=82=AC=E6=94=B6?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/RentCollection/rentcollection/rentCollectionList.jsp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp index a4e43094d..205b697b5 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp @@ -9,8 +9,10 @@ History Log: */ String userid=CurUser.getUserID(); + String username=CurUser.getUserName(); ASObjectModel doTemp = new ASObjectModel("RentCollectionList"); - String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract"); + doTemp.appendJboWhere(" and ui.USERNAME='"+username+"'"); + //String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract"); //doTemp.appendJboWhere(sCondtion); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- From d7f286829fac40c1a005482da58ca01fd3f97dcb Mon Sep 17 00:00:00 2001 From: amarsoft Date: Tue, 21 Aug 2018 11:32:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherMethodSettle/IncomeVoucher.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java index 4ced8986f..9c5445301 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java @@ -30,9 +30,9 @@ public class IncomeVoucher extends BaseBussiness { cvci.CreateVoucher(FlowUnid, "PZ2018080400000103", "feetype27");//确认贴息收入--直租 - CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); - cvri.CreateVoucher(FlowUnid,"PZ2018081600000120");//网银收款转预收--回租 - cvri.CreateVoucher(FlowUnid,"PZ2018081600000121");//网银收款转预收--直租 + //CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); + //cvri.CreateVoucher(FlowUnid,"PZ2018081600000120");//网银收款转预收--回租 + //cvri.CreateVoucher(FlowUnid,"PZ2018081600000121");//网银收款转预收--直租 return "true"; } From 6f771b9a738184fb29d2433153296516a498574b Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Tue, 21 Aug 2018 11:52:25 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AF=B9=E6=89=80=E6=9C=89=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=B8=A6=E5=87=BA=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=97=B6=E8=B5=84=E6=96=99=E7=9A=84=E6=B5=81=E7=A8=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E4=B8=93=E9=97=A8=E7=9A=84jsp?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=86=99=E6=AD=BBobjecttype=E4=B8=BA?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=93=AA=E4=B8=AA=E6=B5=81=E7=A8=8B=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=B0=B1=E5=86=8DDocListMain.jsp=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=EF=BC=8C=E5=8F=82=E7=85=A7=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=92=A4=E9=94=80=E6=B5=81=E7=A8=8B=20=E5=AF=B9=E4=BA=8E?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE=E6=B5=81=E7=A8=8B=E6=88=96?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8A=A8=E6=80=81=E7=94=9F=E6=88=90=E9=99=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=88=99=E8=B5=B0payDocList.jsp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/DocList/BussinessApproveDocList.jsp | 192 ++++++++++++++++++ WebContent/Tenwa/Comm/DocList/DocListMain.jsp | 6 +- 2 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp diff --git a/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp new file mode 100644 index 000000000..ad877fe8f --- /dev/null +++ b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp @@ -0,0 +1,192 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%> +<%@ page import="com.tenwa.doc.action.DocListInitAction" %> +<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %> +<% + /* + 带出业务申请时附件的专用页面 + Author: undefined 2016-09-01 + Content: + History Log: + */ + + String flowunid=CurPage.getParameter("FlowUnid"); + String ProjectId=CurPage.getParameter("ProjectId"); + String carAttributes=CurPage.getParameter("carAttributes");//获取车类型 + if(flowunid==""||flowunid==null){ + flowunid="flowunid"; + } + + String sObjectType = CurPage.getParameter("FlowNo");//流程类型 + String ishistory=CurPage.getParameter("IsHistory"); + String nodeNo=CurPage.getParameter("NodeNo"); + String RightType= CurPage.getParameter("RightType"); + String username=CurUser.getUserName(); + String sTempletNo=CurPage.getParameter("TempletNo"); + if(sTempletNo==null){ + sTempletNo="FlowPayDocList"; + } + + String compClientID = request.getParameter("CompClientID"); + + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + doTemp.appendJboWhere(" and rela.proj_id='"+ProjectId+"' and rela.objecttype='BusinessApplyFlow'"); + + doTemp.setLockCount(2); + if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + doTemp.setVisible("operation", false); + } + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "0"; + dwTemp.setPageSize(50); + if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + dwTemp.ReadOnly = "1";//只读模式 + RightType="ReadOnly"; + isShowButton=false; + }else{ + isShowButton=true; + } + dwTemp.genHTMLObjectWindow(flowunid); + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] =null; + + sButtons=new String[][]{ + {"true","","Button","保存","保存所有修改","saveRecord()","","","",""}, + }; + +%> + +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp index a24a8fe8b..0dd20db6f 100644 --- a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp +++ b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp @@ -40,7 +40,11 @@ var docList="<%=docList%>"; myleft.width=1; if("SingleRow"=="<%=type%>"){ - AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right",""); + if("BusinessCancelFlow"=="<%=sFlowNo%>"){ + AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right",""); + }else{ + AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right",""); + } }else{ AsControl.OpenView("/Tenwa/Comm/DocList/CustomerDocTab.jsp","docList="+docList,"right",""); } From eb4b59c20c0a3528bc2b7084bf18cb37124a74ea Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 21 Aug 2018 14:25:56 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A7=9F=E9=87=91=E5=82=AC=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/RentCollection/overduedunning/OverdueDunningList.jsp | 2 ++ .../Flow/RentCollection/rentcollection/rentCollectionList.jsp | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp index 23f3e7497..9d132388e 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp @@ -7,7 +7,9 @@ Content: History Log: */ + String username=CurUser.getUserName(); ASObjectModel doTemp = new ASObjectModel("OverdueDunningList"); + doTemp.appendJboWhere(" and ui.USERNAME='"+username+"'"); //String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract"); //doTemp.appendJboWhere(sCondtion); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp index 205b697b5..7538609ab 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp @@ -9,9 +9,7 @@ History Log: */ String userid=CurUser.getUserID(); - String username=CurUser.getUserName(); ASObjectModel doTemp = new ASObjectModel("RentCollectionList"); - doTemp.appendJboWhere(" and ui.USERNAME='"+username+"'"); //String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract"); //doTemp.appendJboWhere(sCondtion); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); From 5f634c2fa6972fb7d6cdb2e4f213de0fb6d060f8 Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Tue, 21 Aug 2018 14:32:36 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=20=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=AF=B9=E5=AE=A2=E6=88=B7=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=8C=E4=BA=A7=E5=93=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=B3=95=E4=BA=BA=E4=B8=8E=E8=87=AA=E7=84=B6=E7=9A=84?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=90=8E=E3=80=82=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=AE=A2=E6=88=B7=E7=B1=BB=E5=9E=8B=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AF=E8=87=AA=E7=84=B6=E4=BA=BA=E5=88=99=E6=8A=8A006?= =?UTF-8?q?=E5=BC=80=E5=A4=B4=E7=9A=84=E9=99=84=E4=BB=B6=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E6=8E=92=E9=99=A4=EF=BC=8C=E5=8F=8D=E4=B9=8B=E6=B3=95=E4=BA=BA?= =?UTF-8?q?=E6=8A=8A003=E5=BC=80=E5=A4=B4=E7=9A=84=E6=8E=92=E9=99=A4?= =?UTF-8?q?=E3=80=82=E9=9C=80=E8=A6=81=E4=BB=8E=E5=89=8D=E5=8F=B0=E4=BC=A0?= =?UTF-8?q?=E5=85=A5CustomerType=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Comm/DocList/PayDocList.jsp | 2 ++ src_core/com/tenwa/doc/action/DocListInitAction.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp index d03643405..e5e75d59f 100644 --- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp +++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp @@ -10,6 +10,7 @@ */ String flowunid=CurPage.getParameter("FlowUnid"); + String CustomerType=CurPage.getParameter("CustomerType"); String carAttributes=CurPage.getParameter("carAttributes");//获取车类型 if(flowunid==""||flowunid==null){ flowunid="flowunid"; @@ -44,6 +45,7 @@ Map docParam=new HashMap(); Map other=new HashMap(); other.put("carAttributes", carAttributes); + other.put("CustomerType", CustomerType); docParam.put("ObjectType",sObjectType); docParam.put("proj_id", flow.getAttribute("proj_id").getString()); docParam.put("contract_id", flow.getAttribute("contract_id").getString()); diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java index 1df6b6d08..3a2ca6fa7 100644 --- a/src_core/com/tenwa/doc/action/DocListInitAction.java +++ b/src_core/com/tenwa/doc/action/DocListInitAction.java @@ -36,9 +36,15 @@ public class DocListInitAction { */ @SuppressWarnings("unchecked") public static void initDocList(Map param,Map other,String docno,Configure curConfig) throws Exception{ + String CustomerType = other.get("CustomerType"); String[] itemnos=docno.split(","); String s=""; for(int i=0;i0){ @@ -48,9 +54,11 @@ public class DocListInitAction { BizObjectManager relaBm=JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME); BizObjectManager libBm=JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME); BizObjectManager configBm=JBOFactory.getBizObjectManager(LB_DOCCONFIG.CLASS_NAME); - + if("".equals(docno)){ + return; + } String sql=getDocSQL(param,docno); - BizObject rela=relaBm.createQuery(sql).getSingleResult(false); + BizObject rela=relaBm.createQuery(sql).getSingleResult(true); String relativeid=""; String libid=""; if(rela==null){