diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp index 152f7ce14..76948ebdb 100644 --- a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp @@ -143,9 +143,18 @@ } - function stamp(){ - var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=AdjustmentNotice"); + var filename = getItemValue(0,getRow(),"FILENAME"); + if(filename==""){ + alert("ÇëÏÈÉú³É×â½ðµ÷Õû֪ͨÊ飡£¡"); + return; + }; + var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=AdjustmentNotice,contract_id="+getItemValue(0,getRow(),"ID")); + if("success"==result){ + alert("¸ÇÕ³ɹ¦£¡£¡"); + }else{ + alert("¸ÇÕÂʧ°Ü£¡£¡"); + } } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/fileTemplate/租金支付通知书.docx b/WebContent/fileTemplate/租金支付通知书.docx index 7063cfea1..bfad62567 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 bdb6702e5..bf2e8747b 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -2452,7 +2452,7 @@ public String claimSign(JBOTransaction tx) throws Exception { if("transfer".equals(flagType)){ DOCRELATIVE=bom.createQuery(" OBJECTTYPE='transfer' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false); }else if("AdjustmentNotice".equals(flagType)){ - DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false); + DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false); }else if("TriditionCollection".equals(flagType)){ DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype='TriditionCollection' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); }else if("TriditionSuspension".equals(flagType)){ diff --git a/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java b/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java index 3b22e4a29..2f7394999 100644 --- a/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java +++ b/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java @@ -174,7 +174,7 @@ public class NewPartnerCompanyController{ BizObject newCustomerType = typeManager.newObject(); newCustomerType.setAttributeValue("customerid",newCustomer.getAttribute("customerid").getString()); newCustomerType.setAttributeValue("custtype",partnerType); - newCustomerType.setAttributeValue("custstatus","status02"); + newCustomerType.setAttributeValue("custstatus","status04"); newCustomerType.setAttributeValue("status","valid"); newCustomerType.setAttributeValue("isoriginal","yes"); newCustomerType.setAttributeValue("inputuserid", userId);