From a8ee3258af6a92a95aa534488e8b9bbe7aed7858 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Thu, 12 Nov 2020 18:59:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=9F=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reckon/copydata/CopyFileToOther.java      | 40 ++++++++++++++++---
 .../base/businessobject/FtpDownloadFile.java  |  6 +++
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/calc/com/tenwa/reckon/copydata/CopyFileToOther.java b/calc/com/tenwa/reckon/copydata/CopyFileToOther.java
index 87a3c1e3b..c834e0d76 100644
--- a/calc/com/tenwa/reckon/copydata/CopyFileToOther.java
+++ b/calc/com/tenwa/reckon/copydata/CopyFileToOther.java
@@ -57,11 +57,39 @@ public class CopyFileToOther {
 			StringBuffer  docSb = new StringBuffer();
 			for (String docName : docNameList) {
 				String[] docNames = docName.split("@");
-				if(docNames[0].length()>3){
-					docSb.append("'");
-					docSb.append(docNames[1]);
-					docSb.append("',");
+				if("RentPlan".equals(docNames[0])){
+					String[] contractNoArray = contractNos.split("@");
+					String[] batchNoArray = batchNos.split("@");
+					for(int i=0;i<contractNoArray.length;i++){
+						String fileSavePath_xml = fileSavePath_temp+"/"+contractNoArray[i]+"/";
+						String templateParam = "{\"OBJECTTYPE\":\"租金支付表导出\"@\"CurUserId\":\""+userid+"\"@\"fileSavePath\":\""+fileSavePath_xml+"\"@\"CONTRACT_NO\":\""+contractNoArray[i]+"\"}";
+						System.out.println("路径为："+fileSavePath_xml);
+						File temDir = new File(fileSavePath_xml);
+						if(!temDir.exists()){
+						   temDir.mkdirs();
+						  }
+						coa.setTemplateNo(templateNo);
+						coa.setTemplateParam(templateParam);
+						String result = coa.createOfficeByTemplate(tx);
+						if("success".equals(result)){
+							BizObjectManager bom = JBOFactory.getBizObjectManager(LC_COPYFILE_LOG.CLASS_NAME);
+							BizObject nbom = bom.newObject();
+							nbom.setAttributeValue("CONTRACT_NO", contractNoArray[i]);
+							nbom.setAttributeValue("BATCH_NO", batchNoArray[i]);
+							nbom.setAttributeValue("COPY_TYPE","租金计划");
+							nbom.setAttributeValue("INPUTTIME",StringFunction.getTodayNow());
+							nbom.setAttributeValue("INPUTUSERID",userid);
+							bom.saveObject(nbom);
+						}
+					}
+				}else{
+					if(docNames[0].length()>3){
+						docSb.append("'");
+						docSb.append(docNames[1]);
+						docSb.append("',");
+					}
 				}
+				
 			}
 			if(docSb!=null&&docSb.length()>0){
 				cp.copyFile(docSb.substring(0,docSb.length()-1).toString());
@@ -69,7 +97,7 @@ public class CopyFileToOther {
 				return "数据有误！";
 			}
 		}
-		if(fileList.contains("RentPlan")){
+		/*if(fileList.contains("RentPlan")){
 			
 			String[] contractNoArray = contractNos.split("@");
 			String[] batchNoArray = batchNos.split("@");
@@ -94,7 +122,7 @@ public class CopyFileToOther {
 					bom.saveObject(nbom);
 				}
 			}
-		}
+		}*/
 		tx.commit();
 		//压缩
 		FileOutputStream fos1 = new FileOutputStream(new File(fileSavePath+"/"+time+".zip"));
diff --git a/src_base/com/amarsoft/app/base/businessobject/FtpDownloadFile.java b/src_base/com/amarsoft/app/base/businessobject/FtpDownloadFile.java
index 14bad4b39..5c8e23027 100644
--- a/src_base/com/amarsoft/app/base/businessobject/FtpDownloadFile.java
+++ b/src_base/com/amarsoft/app/base/businessobject/FtpDownloadFile.java
@@ -39,6 +39,12 @@ public class FtpDownloadFile {
 				
 			}
 		}
+		//添加租金计划显示
+		BusinessObject docRent = BusinessObject.createBusinessObject();
+		docRent.setAttributeValue("ID", "RentPlan");
+		docRent.setAttributeValue("SortNo", "RentPlan");
+		docRent.setAttributeValue("Name","租金计划表");
+		lst.add(docRent);
 		return lst;
 	}