From 1ea67ca52b942db1b771ad5aca33937853095f87 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Mon, 30 Jul 2018 15:44:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E8=BD=AC=E7=A7=BB=E8=AF=81?= =?UTF-8?q?=E6=98=8E=E5=92=8C=E6=8F=90=E5=89=8D=E7=BB=93=E6=B8=85=E8=AF=81?= =?UTF-8?q?=E6=98=8E=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBContractDevolutionInfo.jsp | 20 ++++++++++-------- .../Flow/Comm/LBContractEnd/QuotationList.jsp | 8 ++++++- WebContent/fileTemplate/催收函.docx | Bin 17068 -> 13785 bytes .../action/ContractSignAction.java | 13 ++++++++++-- .../controller/QutationAction.java | 12 ++++++++++- 5 files changed, 40 insertions(+), 13 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp index 0f60ca5fc..0479bd7e2 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp @@ -34,13 +34,13 @@ BizObjectManager bom=JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME); BizObject cust=bom.createQuery("contract_id=:contract_id and is_main='Y'").setParameter("contract_id", contractid).getSingleResult(false); String custname=cust.getAttribute("customer_name").toString();;//Ö÷³Ð×âÈË - String planinformation=ProductParamUtil.getProductParameterValue(product_id,"PRD0314","planinformation");//·½°¸ÀàÐÍ +// String planinformation=ProductParamUtil.getProductParameterValue(product_id,"PRD0314","planinformation");//·½°¸ÀàÐÍ String money="";//Áô¹º¼Û - if("SinglePlan".equals(planinformation)){ - BizObjectManager bom1=JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME); - BizObject condition=bom1.createQuery("contract_id=:contract_id ").setParameter("contract_id", contractid).getSingleResult(false); - money=condition.getAttribute("NOMINAL_PRICE").toString(); - } +// if("SinglePlan".equals(planinformation)){ +// BizObjectManager bom1=JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME); +// BizObject condition=bom1.createQuery("contract_id=:contract_id ").setParameter("contract_id", contractid).getSingleResult(false); +// money=condition.getAttribute("NOMINAL_PRICE").toString(); +// } String ishistory=CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); String RightType = CurPage.getParameter("RightType");//Ñ¡Ôñģʽ @@ -76,7 +76,7 @@ dwTemp.genHTMLObjectWindow(sFlowUnid);//µÃµ½µÄ²ÎÊý CurPage.getCurComp().setAttribute("RightType",RightType); - dwTemp.replaceColumn("devolution", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("devolution", "", CurPage.getObjectWindowOutput()); %> <%/*~END~*/%> @@ -115,7 +115,8 @@ var sparam=""; //Ä£°åºÅ - param["templateNo"]="e1fc3afacfbc46fea0a881ac20de23cc"; + //param["templateNo"]="e1fc3afacfbc46fea0a881ac20de23cc"; + param["templateNo"]="a9335f5624124b6db29f0d721fc8b61c"; //Éú³ÉÎļþ¹ØÁª¹ØÏµ tempParam["OBJECTTYPE"]="²úÈ¨×ªÒÆµ¥"; @@ -133,9 +134,10 @@ if(sparam.length>0){sparam+=",";} sparam+=key+"="+param[key]; } - var deleteparam ="PROJECT_PLAN_NUMBER="+"<%=contractid%>"; + var deleteparam ="PROJECT_PLAN_NUMBER="+"<%=contractid%>"+",objecttype=²úÈ¨×ªÒÆµ¥"; 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=<%=contractid%>,PLAN_LIST=transfer"); if(bIsInsert) { beforeInsert(); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp index e4e779986..33adca868 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp @@ -16,6 +16,12 @@ String ishistory = CurPage.getParameter("ishistory"); String nodeNo=CurPage.getParameter("NodeNo"); String RightType = CurPage.getParameter("RightType"); + String docname = CurPage.getParameter("docname"); + if("settle".equals(docname)){ + docname = "½áÇåÄ£°å"; + }else if("transfer".equals(docname)){ + docname = "²úÈ¨×ªÒÆÖ¤Êé"; + }; String sTempletNo = CurPage.getParameter("TempletNo");//Ä£°åºÅ sTempletNo = "DevolutionList"; String userName = CurUser.getUserName(); @@ -28,7 +34,7 @@ dwTemp.Style = "1"; //--ÉèÖÃΪGrid·ç¸ñ-- dwTemp.ReadOnly = "1"; dwTemp.setPageSize(50); - dwTemp.genHTMLObjectWindow(contract_id); + dwTemp.genHTMLObjectWindow(docname+","+contract_id); //0¡¢ÊÇ·ñչʾ 1¡¢ ȨÏÞ¿ØÖÆ 2¡¢ չʾÀàÐÍ 3¡¢°´Å¥ÏÔʾÃû³Æ 4¡¢°´Å¥½âÊÍÎÄ×Ö 5¡¢°´Å¥´¥·¢Ê¼þ´úÂë 6¡¢ 7¡¢ 8¡¢ 9¡¢Í¼±ê£¬CSS²ãµþÑùʽ 10¡¢·ç¸ñ String sButtons[][] = null; diff --git a/WebContent/fileTemplate/催收函.docx b/WebContent/fileTemplate/催收函.docx index b0a4be35ce19a8ee2a6ae56bcb7a991edd771ad5..964487c386e930b1e2f967388ba09529597f9006 100644 GIT binary patch literal 13785 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 C#WD*3 literal 17068 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 diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index a7e1bad71..69cc2a0ce 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -1464,6 +1464,10 @@ public void wordToPdfJar(JBOTransaction tx){ BizObject DOCRELATIVE = null; if("null".equals(PLAN_LIST)){ DOCRELATIVE=bom.createQuery("plan_number=:plan_number").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); + }else if("transfer".equals(PLAN_LIST)){ + DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='²úÈ¨×ªÒÆµ¥'").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); }else{ DOCRELATIVE=bom.createQuery("plan_number=:plan_number and plan_list=:plan_list").setParameter("plan_number",PAYMENT_NUMBER).setParameter("plan_list", PLAN_LIST).getSingleResult(false); } @@ -2004,7 +2008,7 @@ public String claimSign(JBOTransaction tx) throws Exception { /** - * ´òÓ¡×â½ð֪ͨÊé²¢·¢¶ÌПø¿Í»§ + * ´ßÊÕº¯¸Ç¹«Ë¾Õ * @param tx * @return * @throws Exception @@ -2013,7 +2017,12 @@ public String claimSign(JBOTransaction tx) throws Exception { requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); String libraryid=""; BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); - BizObject DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype LIKE '%´òÓ¡´ß¿îº¯%' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); + BizObject DOCRELATIVE = null; + if("settle".equals(flagType)){ + DOCRELATIVE=bom.createQuery("CONTRACT_ID=:contractid and objecttype='Ìáǰ½áÇåÖ¤Ã÷' ").setParameter("contractid",contract_id).getSingleResult(false); + }else{ + DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype LIKE '%´òÓ¡´ß¿îº¯%' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); + } if (DOCRELATIVE != null) { String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); diff --git a/src_core/com/tenwa/officetempalte/controller/QutationAction.java b/src_core/com/tenwa/officetempalte/controller/QutationAction.java index f130c9be9..fdbb65a12 100644 --- a/src_core/com/tenwa/officetempalte/controller/QutationAction.java +++ b/src_core/com/tenwa/officetempalte/controller/QutationAction.java @@ -24,6 +24,7 @@ import com.tenwa.officetempalte.util.FileOperatorUtil; public class QutationAction { String PROJECT_PLAN_NUMBER; String CONTRACT_PLAN_NUMBER; + String objecttype; public String getPROJECT_PLAN_NUMBER() { @@ -44,6 +45,15 @@ public class QutationAction { public void setCONTRACT_PLAN_NUMBER(String cONTRACT_PLAN_NUMBER) { CONTRACT_PLAN_NUMBER = cONTRACT_PLAN_NUMBER; } + + public String getObjecttype() { + return objecttype; + } + + + public void setObjecttype(String objecttype) { + this.objecttype = objecttype; + } //¸ù¾Ýǰ̨²ÎÊýÉú³ÉÎĵµ @@ -77,6 +87,6 @@ public class QutationAction { } public void deletedevtion(JBOTransaction tx) throws Exception{ BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); - bom.createQuery("delete from O where CONTRACT_ID=:CONTRACT_ID and objecttype='²úÈ¨×ªÒÆµ¥'").setParameter("CONTRACT_ID",PROJECT_PLAN_NUMBER).executeUpdate(); + bom.createQuery("delete from O where CONTRACT_ID=:CONTRACT_ID and objecttype=:objecttype ").setParameter("CONTRACT_ID",PROJECT_PLAN_NUMBER).setParameter("objecttype", objecttype).executeUpdate(); } } \ No newline at end of file