From 5e423205c01f4f2b71cfd6dcc549d5375283fb50 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Wed, 13 May 2020 14:02:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=EF=BC=88=E7=94=B1=E4=BA=8E=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA=E4=BA=86=E5=AD=98?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=EF=BC=8C=E6=89=80=E4=BB=A5=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E5=B0=86=E5=AF=B9=E5=BA=94=E6=95=B0=E5=AD=97=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=90=8E=E5=86=8D=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tenwa/reckon/copydata/FileCopyToOtherPath.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java b/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java
index 01787cc3a..4e19e5df1 100644
--- a/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java
+++ b/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java
@@ -21,7 +21,7 @@ public class FileCopyToOtherPath {
 	private String userid;
 	private String fileSavePath_temp;
 	
-	public String doCopy(String contractNo,String bacthNo,String type){
+	public String doCopy(String contractNo,String bacthNo,String type,String archive){
 		Transaction Sqlca = Transaction.createTransaction("als");
 		//原路径
 		String srcPath ;
@@ -35,7 +35,8 @@ public class FileCopyToOtherPath {
 					+" LEFT JOIN LB_DOCLIBRARY LDL ON LDL.ID = O.LIBRARY_ID"
 					+" LEFT JOIN LB_DOCRELATIVE LDR ON LDL.RELATIVE_ID = LDR.ID"
 					+" LEFT JOIN LB_CONTRACT_INFO LCI ON LDR.CONTRACT_ID = LCI.ID"
-					+" WHERE (O.DELETEED <>'Y' OR O.DELETEED IS NULL) AND LCI.CONTRACT_NO ='"+contractNo+"' AND LDL.DOC_TYPE LIKE '"+type+"%'";
+					+" WHERE (O.DELETEED <>'Y' OR O.DELETEED IS NULL) AND LCI.CONTRACT_NO ='"+contractNo+"' AND (LDL.DOC_TYPE LIKE '"+type+"%'"
+					+" or LDL.DOC_TYPE in "+archive+")";
 			Map<String,String> params=new HashMap<String,String>();
 			List<Map<String, String>> pathList = DataOperatorUtil.getDataBySql(Sqlca,sql,params);
 			if(pathList.size()>0){
@@ -75,11 +76,14 @@ public class FileCopyToOtherPath {
 	
 	public String copyFile(String type){
 		String failNo="";
+		String archive="";
 		if("PayFileList".equals(type)){
 			type="放款资料";
+			archive = "('007','008','016','031','033')";
 		}
 		if("FileList".equals(type)){
 			type="归档资料";
+			archive = "('002','009','010','011','018','034')";
 		}
 		List<String> cns = Arrays.asList(contractNos.split("@"));
 		List<String> bns = Arrays.asList(batchNos.split("@"));
@@ -87,7 +91,7 @@ public class FileCopyToOtherPath {
 			if("".equals(cns.get(i))||cns.get(i)==null){
 				continue;
 			}
-			String result = doCopy(cns.get(i),bns.get(i),type);
+			String result = doCopy(cns.get(i),bns.get(i),type,archive);
 			if(!"Y".equals(result)){
 				failNo+=cns.get(i)+";";
 			}