diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/TriditionGeneratedReminderLetterList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/TriditionGeneratedReminderLetterList.jsp
new file mode 100644
index 000000000..a6cb1c923
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/TriditionGeneratedReminderLetterList.jsp
@@ -0,0 +1,162 @@
+<%@page import="java.util.Date"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+<%	
+	/*
+        Author: undefined 2016-08-06
+        Content: 
+        History Log: 
+    */
+    Date d=new Date();
+	SimpleDateFormat df=new SimpleDateFormat("yyyy/MM/dd");
+	String now=df.format(new Date(d.getTime()));//yyyy/MM/dd¸ñʽ
+	ASObjectModel doTemp = new ASObjectModel("TGeneratedReminderLetterList");
+/* 	String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
+	doTemp.appendJboWhere(sCondtion); */
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--ÉèÖÃΪGrid·ç¸ñ--
+	dwTemp.MultiSelect=true;
+	dwTemp.ReadOnly = "1";	 //Ö»¶Áģʽ
+	dwTemp.setPageSize(10);
+	//dwTemp.genHTMLObjectWindow(StringFunction.getToday("yyyy/MM/dd"));
+	
+	dwTemp.genHTMLObjectWindow("3");
+
+
+	//0¡¢ÊÇ·ñչʾ 1¡¢	ȨÏÞ¿ØÖÆ  2¡¢ չʾÀàÐÍ 3¡¢°´Å¥ÏÔʾÃû³Æ 4¡¢°´Å¥½âÊÍÎÄ×Ö 5¡¢°´Å¥´¥·¢Ê¼þ´úÂë	6¡¢	7¡¢	8¡¢	9¡¢Í¼±ê£¬CSS²ãµþÑùʽ 10¡¢·ç¸ñ
+	String sButtons[][] = {
+		{"true","","Button","Éú³É´ßÊÕº¯","Éú³É´ßÊÕº¯","exportExcel('1')","","","","btn_icon_transfer",""},
+		{"true","","Button","ÅúÁ¿ÏÂÔØ","ÅúÁ¿ÏÂÔØ","lotdown()","","","","btn_icon_transfer",""},
+		{"true","All","Button","Éú³Éµç×ÓÕÂ","¸Ç¹«Ë¾µç×ÓÕÂ","stamp()","","","",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	//ÔÚ¼ÓÔØÍê±í¸ñºóµ÷ÓÃ
+	function afterSearch(){
+			for(var i=0;i<getRowCount(0);i++){
+				var html="";
+					html+='<a onclick=downloadFile(\''+getItemValue(0,i,"attrid")+'\')><font color="blue">'+"ÏÂÔØ&nbsp&nbsp&nbsp&nbsp&nbsp"+'</font></a>';
+				getObj(0,i,"FILENAME").innerHTML=html+'<font >'+getObj(0,i,"FILENAME").innerHTML+'</font>';
+			};
+				 
+	}
+	function exportExcel(sReturn){
+		var number = 0;
+		var payment_numbers = getItemValueArray(0,'payment_number');
+		for(var i=0;i<payment_numbers.length;i++){
+			if(typeof(payment_numbers[i])=="undefined" || payment_numbers[i].length>0 ){
+				var param={};
+				var tempParam={};
+				var sparam="";
+				//Ä£°åºÅ
+				param["templateNo"]="e8b80876a3fe45eebe11cb9b8072ab33";
+				//Éú³ÉÎļþ¹ØÁª¹Øϵ
+				tempParam["OBJECTTYPE"]="TriditionCollection";
+				tempParam["FLOW_UNID"]="<%=new java.util.Date().getTime()%>";
+				tempParam["ID"]=getItemValue(0,getRow(0),"ID");
+				tempParam["contract_id"]=getItemValue(0,getRow(0),"ID");
+				tempParam["payment_number"]=getItemValue(0,getRow(0),"PAYMENT_NUMBER");
+				tempParam["payment_number"]=payment_numbers[i];
+				tempParam["PLAN_NUMBER"]=payment_numbers[i];
+				tempParam["businesstype"]="3";
+				//Éú³ÉÄ£°å¹Ì¶¨²ÎÊý
+				tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
+				tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
+				tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
+				tempParam["SendDate"]=sReturn;
+				param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//Éú³ÉÄ£°åµÄ²ÎÊý¾Ý
+				for(var key in param){
+				if(sparam.length>0){sparam+=",";}
+				sparam+=key+"="+param[key];
+				}
+				RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentCollectDeleteAction","deletequtation","plan_number="+payment_numbers[i]);
+				var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
+				var id = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","PAYMENT_NUMBER="+payment_numbers[i]+",PLAN_LIST=TriditionCollection");
+				if(typeof(id)=="undefined" || id.length <= 0 || id==""){
+					RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentCollectDeleteAction","deletequtation","plan_number="+payment_numbers[i]);
+				}else{
+					number++;
+				}
+			}
+		}
+		if(payment_numbers.length==0){
+			alert("ÇëÏÈÑ¡ÔñÊý¾Ý£¡£¡£¡");
+			return;
+		}else if(number==0){
+			alert("Éú³Éʧ°Ü£¡£¡£¡");
+		}else if(number==payment_numbers.length){
+			alert("Éú³É³É¹¦£¡£¡£¡");
+		}else{
+			alert("²¿·ÖÉú³É³É¹¦£¡£¡£¡");
+		}
+		reloadSelf();
+	}
+	
+	function downloadFile(id){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+	}
+	function lotdown(){
+		var attrids=getItemValueArray(0,"attrid");
+		if(typeof(attrids)=="undefined"||attrids==null||attrids==""){alert("ÇëÑ¡Ôñ");return;}
+			lotdownloadFile(attrids);
+			
+	}
+	function lotdownloadFile(id){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/DownloadZipServlet?CompClientID=<%=sCompClientID%>&id="+id, "downloadTemplate");
+	}
+	function getNowFormatDate() {
+	    var date = new Date();
+	    var seperator1 = "-";
+	    var seperator2 = ":";
+	    var month = date.getMonth() + 1;
+	    var strDate = date.getDate();
+	    if (month >= 1 && month <= 9) {
+	        month = "0" + month;
+	    }
+	    if (strDate >= 0 && strDate <= 9) {
+	        strDate = "0" + strDate;
+	    }
+	    var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+	            + " " + date.getHours() + seperator2 + date.getMinutes()
+	            + seperator2 + date.getSeconds();
+	    return currentdate;
+	}
+	
+	function stamp(){
+		var number = 0;
+		var singNumber = 0;
+		var PAYMENT_NUMBERS=getItemValueArray(0,"PAYMENT_NUMBER");
+		var PLAN_LISTS=getItemValueArray(0,"PLAN_LIST");
+		var FILENAMES=getItemValueArray(0,"FILENAME");
+		for(var i=0;i<PAYMENT_NUMBERS.length;i++){
+			var flie = FILENAMES[i];
+			if(flie.length>0){
+				var plan_number=PAYMENT_NUMBERS[i];//Ͷ·Å±àºÅ
+				var plan_list=PLAN_LISTS[i];//ÆÚ´Î
+				var contractID = getItemValue(0,getRow(0),"contract_id");
+				var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","PAYMENT_NUMBER="+plan_number+",PLAN_LIST="+null+",contract_id="+contractID+",flagType=TriditionCollection");
+				if("success"==result){
+					number++;
+				}
+			}else{
+				singNumber++;
+			}
+		}
+		if(PAYMENT_NUMBERS.length==0){
+			alert("ÇëÏÈÑ¡ÔñÊý¾Ý£¡£¡£¡");
+			return;
+		}else if(PAYMENT_NUMBERS.length==singNumber){
+			alert("ÇëÑ¡ÏÈÉú³É´ßÊÕº¯£¡£¡£¡");
+		}else if(number==0){
+			alert("¸ÇÕÂʧ°Ü£¡£¡£¡");
+		}else if(number==PAYMENT_NUMBERS.length){
+			alert("¸ÇÕ³ɹ¦£¡£¡£¡");
+		}else{
+			alert("²¿·Ö¸ÇÕ³ɹ¦£¡£¡£¡");
+		}
+		location.reload();
+	}
+</script>
+<%@ 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 964487c38..236fdff46 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 918ecd294..77b43390b 100644
--- a/src/com/tenwa/channelportal/action/ContractSignAction.java
+++ b/src/com/tenwa/channelportal/action/ContractSignAction.java
@@ -1622,6 +1622,8 @@ public void wordToPdfJar(JBOTransaction tx){
 				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(PLAN_LIST)){
 				DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false);
+			}else if("TriditionCollection".equals(PLAN_LIST)){
+				 DOCRELATIVE=bom.createQuery(" OBJECTTYPE='TriditionCollection' and plan_number=:plan_number").setParameter("plan_number",PAYMENT_NUMBER).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);
 			}
@@ -2449,6 +2451,8 @@ public String claimSign(JBOTransaction tx) throws Exception {
 			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);
+		}else if("TriditionCollection".equals(flagType)){
+			DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype='TriditionCollection' ").setParameter("plan_number",PAYMENT_NUMBER).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 24053243a..417c03b4d 100644
--- a/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java
+++ b/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java
@@ -113,4 +113,68 @@ public class FindCollectAction {
 	   }
 	   return attributeid;
 	}
+	
+
+	public static String TfindFileName(String plan_number) throws JBOException{
+		String filename = "";
+		BizObjectManager bom = JBOFactory
+				.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+		BizObject DOCRELATIVE = bom.createQuery("plan_number=:plan_number and plan_list is null and objecttype='TriditionCollection'")
+				.setParameter("plan_number", plan_number)
+				.getSingleResult(false);
+
+		if (DOCRELATIVE != null) {
+			String DOCRELATIVEid = DOCRELATIVE.getAttribute("id").toString();
+			BizObjectManager bom1 = JBOFactory
+					.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+			String DOCLIBRARYid = bom1.createQuery("relative_id=:relative_id")
+					.setParameter("relative_id", DOCRELATIVEid)
+					.getSingleResult(false).getAttribute("id").toString();
+			BizObjectManager bom2 = JBOFactory
+					.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+			filename = bom2.createQuery("library_id=:library_id")
+					.setParameter("library_id", DOCLIBRARYid)
+					.getSingleResult(false).getAttribute("filename").toString();
+		}
+		   return filename;
+	}
+	
+	public static String TfindAttributeid(String plan_number) throws JBOException{
+		String attributeid="";
+		BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+	    BizObject DOCRELATIVE=bom.createQuery("plan_number=:plan_number and plan_list is null and objecttype='TriditionCollection'").setParameter("plan_number",plan_number).getSingleResult(false);
+	   
+	    if(DOCRELATIVE!=null){
+		   String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
+		   BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+		   String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString();
+		   BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+		   attributeid=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("id").toString();
+	   }
+	   return attributeid;
+	}
+	public static String TfindCreatime(String plan_number) throws JBOException{
+		String creatime = "";
+		BizObjectManager bom = JBOFactory
+				.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+		BizObject DOCRELATIVE = bom.createQuery("plan_number=:plan_number and plan_list is null and objecttype='TriditionCollection'")
+				.setParameter("plan_number", plan_number)
+				.getSingleResult(false);
+
+		if (DOCRELATIVE != null) {
+			String DOCRELATIVEid = DOCRELATIVE.getAttribute("id").toString();
+			BizObjectManager bom1 = JBOFactory
+					.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+			String DOCLIBRARYid = bom1.createQuery("relative_id=:relative_id")
+					.setParameter("relative_id", DOCRELATIVEid)
+					.getSingleResult(false).getAttribute("id").toString();
+			BizObjectManager bom2 = JBOFactory
+					.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+			creatime = bom2.createQuery("library_id=:library_id")
+					.setParameter("library_id", DOCLIBRARYid)
+					.getSingleResult(false).getAttribute("inputtime")
+					.toString();
+		}
+		   return creatime;
+	}
 }
\ No newline at end of file