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 b0a4be35c..964487c38 100644 Binary files a/WebContent/fileTemplate/催收函.docx and b/WebContent/fileTemplate/催收函.docx differ 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