From e99b0b5cb819bf284cba71b22377948c419410bb Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 21 May 2020 17:16:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=B6=E5=AE=83=EF=BC=88=E5=88=9D=E7=89=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Core/FlowManager/CopyFileToOther.jsp | 3 +++ .../tenwa/reckon/copydata/FileCopyToOtherPath.java | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/WebContent/Tenwa/Core/FlowManager/CopyFileToOther.jsp b/WebContent/Tenwa/Core/FlowManager/CopyFileToOther.jsp index d25c0c348..e3130c789 100644 --- a/WebContent/Tenwa/Core/FlowManager/CopyFileToOther.jsp +++ b/WebContent/Tenwa/Core/FlowManager/CopyFileToOther.jsp @@ -43,6 +43,9 @@ if(sParam.contains("FileList")){ cp.copyFile("FileList"); } + if(sParam.contains("Other")){ + cp.copyFile("Other"); + } if(sParam.contains("RentPlan")){ String[] contractNoArray = contractNos.split("@"); diff --git a/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java b/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java index 35c2bca5d..1678ba303 100644 --- a/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java +++ b/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java @@ -41,6 +41,14 @@ public class FileCopyToOtherPath { +" 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+"%'" +" or LDL.DOC_TYPE in "+archive+")"; + if("其它".equals(type)){ + sql = "SELECT O.FULLPATH AS FULLPATH, CONCAT(REPLACE(LCI.CONTRACT_NO,'/','-'), '/','"+type+"','/', REPLACE(LDL.ONE_CLASSIFY,'/','-'), '/' , REPLACE(LDL.DOC_NAME,'/','-'), '/', REPLACE(O.FILENAME,'/','-')) AS TARGET_FILE_PATH FROM LB_DOCATTRIBUTE O" + +" 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 one_classify='其他文件'" + +" and LDL.DOC_NAME ='其它'"; + } Map params=new HashMap(); List> pathList = DataOperatorUtil.getDataBySql(Sqlca,sql,params); if(pathList.size()>0){ @@ -97,6 +105,10 @@ public class FileCopyToOtherPath { type="归档资料"; archive = "('002','009','010','011','018','034')"; } + if("Other".equals(type)){ + type="其它"; + archive = ""; + } List cns = Arrays.asList(contractNos.split("@")); List bns = Arrays.asList(batchNos.split("@")); for(int i=0;i