From a37bc714a5907bf0ad5e74ccec19062a9518c138 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 30 Aug 2018 11:02:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=9F=E9=87=91=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=B9=A6=E3=80=81=E7=BB=93=E6=B8=85=E8=AF=81=E6=98=8E=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=89=B9=E9=87=8F=E7=94=9F=E6=88=90=E3=80=81=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E3=80=81=E7=9B=96=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBContractEnd/rightsFileList.jsp | 117 +++++++++++++----- .../Lease/Flow/RentNotify/RentNotifyList.jsp | 108 ++++++++++------ .../action/ContractSignAction.java | 4 +- .../controller/FindCollectAction.java | 4 +- 4 files changed, 160 insertions(+), 73 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp index e4b314553..dd6988506 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp @@ -9,13 +9,16 @@ ASObjectModel doTemp = new ASObjectModel("rightsFileList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- -// dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.MultiSelect=true; dwTemp.setPageSize(10); dwTemp.genHTMLObjectWindow(""); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { {"true","All","Button","结清证明","结清证明","saveRecord()","","","","btn_icon_save"}, + {"true","","Button","批量下载","批量下载","lotdown()","","","","btn_icon_transfer",""}, + {"true","All","Button","公司盖章","公司盖章","stamp()","","","",""}, }; sButtonPosition = "north"; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> @@ -40,37 +43,91 @@ alert("请先选择数据！"); return; } - var param={}; - var tempParam={}; - var sparam=""; - var contract = getItemValue(0,getRow(0),"CONTRACT_ID"); -// param["templateNo"]="a9335f5624124b6db29f0d721fc8b61c"; - param["templateNo"]="dc3a7c204da74515bc6d27771928a95d"; - - //生成文件关联关系 - tempParam["OBJECTTYPE"]="rights"; - tempParam["PROJ_ID"]=getItemValue(0,0,"PROJECT_ID"); - tempParam["CONTRACT_ID"]=contract; - tempParam["INPUTUSERID"]="<%=CurUser.getUserID()%>"; - tempParam["INPUTORGID"]="<%=CurUser.getOrgID()%>"; - tempParam["INPUTTIME"]=new Date(); - //生成模板固定参数 - tempParam["CurUserId"]="<%=CurUser.getUserID()%>"; - tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>"; - tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>"; - - param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据 - for(var key in param){ - if(sparam.length>0){sparam+=",";} - sparam+=key+"="+param[key]; + var number = 0; + var contract_ids = getItemValueArray(0,'CONTRACT_ID'); + var PROJECT_IDS = getItemValueArray(0,'PROJECT_ID'); + var CUSTOMER_NAMES = getItemValueArray(0,'CUSTOMER_NAME'); + for(var i=0;i"; + + param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据 + for(var key in param){ + if(sparam.length>0){sparam+=",";} + sparam+=key+"="+param[key]; + } + var deleteparam ="PROJECT_PLAN_NUMBER="+contract+",objecttype=settle"; + var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.QutationAction","deletedevtion",deleteparam); + var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam); + var id = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","contract_id="+contract+",PLAN_LIST=settle"); + if(typeof(id)=="undefined" || id.length <= 0 || id==""){ + RunJavaMethodTrans("com.tenwa.officetempalte.controller.QutationAction","deletedevtion",deleteparam); + }else{ + number++; + } } - var deleteparam ="PROJECT_PLAN_NUMBER="+contract+",objecttype=rights"; - var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.QutationAction","deletedevtion",deleteparam); - var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam); - RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","contract_id="+contract+",PLAN_LIST=rights"); - alert("生成成功！！"); + if(contract_ids.length==0){ + alert("请先选择数据！！！"); + return; + }else if(number==0){ + alert("生成失败！！！"); + }else if(number==contract_ids.length){ + alert("生成成功！！！"); + }else{ + alert("部分生成成功！！！"); + } +// alert("生成成功！！"); reloadSelf(); } - + function stamp(){ + var number = 0; + var CONTRACT_IDS = getItemValueArray(0,'CONTRACT_ID'); +// var contractID = getItemValue(0,getRow(0),"CONTRACT_ID"); + for(var i=0;i").appendTo("body"); + window.open(sWebRootPath+"/servlet/view/DownloadZipServlet?CompClientID=<%=sCompClientID%>&id="+id, "downloadTemplate"); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp index 694af494e..aa7eb422d 100644 --- a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp @@ -66,44 +66,63 @@ return; */ var PAYMENT_NUMBERS=getItemValueArray(0,"PAYMENT_NUMBER"); var PLAN_LISTS=getItemValueArray(0,"PLAN_LIST"); + + var contract_ids=getItemValueArray(0,"contract_id"); + var customernames=getItemValueArray(0,"customername"); + var contract_numbers=getItemValueArray(0,"contract_number"); + var number = 0; if(typeof(PAYMENT_NUMBERS)=="undefined"||PAYMENT_NUMBERS==null||PAYMENT_NUMBERS==""){alert("请选择");return;} for(var i=0;i"; - - param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据 - for(var key in param){ - if(sparam.length>0){sparam+=",";} - sparam+=key+"="+param[key]; + //生成文件关联关系 + tempParam["OBJECTTYPE"]="租金通知书"; + tempParam["contract_id"]=contract_ids[i]; + tempParam["payment_number"]=PAYMENT_NUMBERS[i]; + tempParam["PLAN_LIST"]=PLAN_LISTS[i]; + tempParam["PLAN_NUMBER"]=PAYMENT_NUMBERS[i]; + tempParam["customername"]=customernames[i]; + tempParam["contract_number"]=contract_numbers[i]; + + + //生成模板固定参数 + tempParam["CurUserId"]="<%=CurUser.getUserID()%>"; + tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>"; + tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>"; + + param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据 + for(var key in param){ + if(sparam.length>0){sparam+=",";} + sparam+=key+"="+param[key]; + } + var plan_number=PAYMENT_NUMBERS[i];//投放编号 + var plan_list=PLAN_LISTS[i];//期次 + var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentNotinyDeleteAction","deletequtation","plan_number="+plan_number+",plan_list="+plan_list); + var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam); + //word转pdf + var id = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","PAYMENT_NUMBER="+plan_number+",PLAN_LIST="+plan_list); + if(typeof(id)=="undefined" || id.length <= 0 || id==""){ + RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentNotinyDeleteAction","deletequtation","plan_number="+plan_number+",plan_list="+plan_list); + }else{ + number++; + } } - var plan_number=PAYMENT_NUMBERS[i];//投放编号 - var plan_list=PLAN_LISTS[i];//期次 - var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentNotinyDeleteAction","deletequtation","plan_number="+plan_number+",plan_list="+plan_list); - var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam); - //word转pdf - var id = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","PAYMENT_NUMBER="+plan_number+",PLAN_LIST="+plan_list); - } - alert("生成成功!"); - reloadSelf(); + if(PAYMENT_NUMBERS.length==0){ + alert("请先选择数据！！！"); + return; + }else if(number==0){ + alert("生成失败！！！"); + }else if(number==PAYMENT_NUMBERS.length){ + alert("生成成功！！！"); + }else{ + alert("部分生成成功！！！"); + } + reloadSelf(); } function lotdown(){ var attrids=getItemValueArray(0,"attrid"); @@ -128,21 +147,32 @@ alert("请先生成租金通知书！"); return; } + var number = 0; var PAYMENT_NUMBERS=getItemValueArray(0,"PAYMENT_NUMBER"); var PLAN_LISTS=getItemValueArray(0,"PLAN_LIST"); + var contract_ids=getItemValueArray(0,"contract_id"); for(var i=0;i <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index f9cdd9d58..18be8a6cf 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -1606,7 +1606,7 @@ public void wordToPdfJar(JBOTransaction tx){ }else if("rights".equals(PLAN_LIST)){ DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='rights'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false); }else if("settle".equals(PLAN_LIST)){ - DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='提前结清证明'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false); + DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='settle'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false); }else if("TX".equals(PLAN_LIST)){ DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype='AdjustInterst' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); }else if("ChangeCar".equals(PLAN_LIST)){ @@ -2288,7 +2288,7 @@ public String claimSign(JBOTransaction tx) throws Exception { BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); BizObject DOCRELATIVE = null; if("settle".equals(flagType)){ - DOCRELATIVE=bom.createQuery("CONTRACT_ID=:contractid and objecttype='提前结清证明' ").setParameter("contractid",contract_id).getSingleResult(false); + DOCRELATIVE=bom.createQuery("CONTRACT_ID=:contractid and objecttype='settle' ").setParameter("contractid",contract_id).getSingleResult(false); }else{ DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype LIKE '%打印催款函%' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); } diff --git a/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java b/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java index 2d8bf2f26..24053243a 100644 --- a/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java +++ b/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java @@ -79,7 +79,7 @@ public class FindCollectAction { String filename = ""; BizObjectManager bom = JBOFactory .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); - BizObject DOCRELATIVE = bom.createQuery("CONTRACT_ID=:contractid and objecttype='rights'") + BizObject DOCRELATIVE = bom.createQuery("CONTRACT_ID=:contractid and objecttype='settle'") .setParameter("contractid", contractid) .getSingleResult(false); @@ -102,7 +102,7 @@ public class FindCollectAction { public static String findRightsAttributeid(String contractid) throws JBOException{ String attributeid=""; BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); - BizObject DOCRELATIVE=bom.createQuery("CONTRACT_ID=:contractid and objecttype='rights'").setParameter("contractid", contractid).getSingleResult(false); + BizObject DOCRELATIVE=bom.createQuery("CONTRACT_ID=:contractid and objecttype='settle'").setParameter("contractid", contractid).getSingleResult(false); if(DOCRELATIVE!=null){ String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); From a0d8f1f1666572de16909b9a702252512fc0429a Mon Sep 17 00:00:00 2001 From: liujiaji Date: Thu, 30 Aug 2018 11:50:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=AD=98=E9=87=8F?= =?UTF-8?q?=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../als/apzl/apply/business/start/bo/BusinessBO.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java index 3d47c2186..437c3994b 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java @@ -24,6 +24,7 @@ import com.amarsoft.are.lang.StringX; import com.base.constant.RestfullConstant; import com.base.util.JsonUtil; import com.base.util.StringUtil; +import com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck; import com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction; public class BusinessBO implements Serializable { @@ -165,7 +166,11 @@ public class BusinessBO implements Serializable { : fieldMap.get("liter".toLowerCase()).toString(); // 排量 this.geartype = fieldMap.get("geartype".toLowerCase()) == null ? "" : fieldMap.get("geartype".toLowerCase()).toString(); // 档位 - + + CustomerInfoCheck CustomerInfoCheck = new CustomerInfoCheck(); + CustomerInfoCheck.setCertid(certid); + CustomerInfoCheck.setCerttype(certtype); + CUSTOMERID = CustomerInfoCheck.checkNameAndCertId(tx); } public void businessAppStart(JBOTransaction tx) throws Exception { @@ -216,6 +221,10 @@ public class BusinessBO implements Serializable { map.put("geartype", geartype); action.setGeartype(geartype); + map.put("geartype", geartype); + action.setGeartype(geartype); + map.put("CustomerId", CUSTOMERID); + map.put("sourcetype", "app"); JSONObject jsonObject = JSONObject.fromObject(map);