From 12143b9853d55a2cf3ce673a386b233113fda008 Mon Sep 17 00:00:00 2001 From: zhaol <15900249928@163.com> Date: Thu, 8 May 2025 15:12:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=A6=82=E6=9E=9C=E6=9C=AA=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=99=84=E4=BB=B6=EF=BC=8C=E5=88=99=E4=B8=8D=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...om.awspaas.user.apps.coe.pal.output.zd.jar | Bin 82536 -> 82635 bytes .../pal/output/zd/report1/Report1Gener.java | 133 ++++++++++-------- 2 files changed, 72 insertions(+), 61 deletions(-) diff --git a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar index 31a1c4658d7d5ff1f95b1ba577b787888323d01d..369f765abb1ad077b59be8ee5fd8aba1b5cf1c49 100644 GIT binary patch delta 10859 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 diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index 8258cfaa..f933ba8d 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -256,78 +256,89 @@ public class Report1Gener { if(HighSecurityUtil.isON()){ PALRepositoryQueryAPIManager.getInstance().upFileSecurityFilter(this.userContext,search); } + boolean isFile=false; if (search != null && search.size() > 0) { - //创建附件目录及复制附件 - fileName = fileName + "_file"; - file = new File(docPath, fileName); - if (!file.exists()) { - log.info("创建附件"); - file.mkdir(); + + for (UpfileModel oneupfileModel : search) { + if ("f".equals(oneupfileModel.getType())) {// 文件 + isFile=true; + //创建附件目录及复制附件 + fileName = fileName + "_file"; + file = new File(docPath, fileName); + if (!file.exists()) { + log.info("创建附件"); + file.mkdir(); + } + break; + } } + } - JSONArray fileTable = new JSONArray(); //流程附件Table - //文件属性附件处理 - int fileIndex = 1; - ArrayList isNumberAscArray = new ArrayList(); - if (search != null && search.size() > 0) { - // 复制附件 - for (UpfileModel upfileModel : search) { - if (!"f".equals(upfileModel.getType())) {// 文件 - continue; - } - // 复制doccenter下的文件 - DCContext dcContext = null; - DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE); - if (dcProfile != null) { - dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName()); - } - File sourceFile = new UtilFile(dcContext.getFilePath()); - File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName()); - try { - UtilFile.copyFile(sourceFile, targetFile); - } catch (Exception e) { - System.out.println(e); - e.printStackTrace(); - } - JSONObject object = new JSONObject(); - //按照附件编号排序 - String fileNamel= upfileModel.getFileName(); - if(UtilString.isNotEmpty(fileNamel)&&fileNamel.contains("附件")&&fileNamel.length()>2&&(fileNamel.contains(":")||fileNamel.contains(":"))) { - if(fileNamel.indexOf("附件")==0) { - int indexOf2 = 3; - if(fileNamel.contains(":")) { - indexOf2 = fileNamel.indexOf(":"); - }else if(fileNamel.contains(":")) { - indexOf2 = fileNamel.indexOf(":"); + if(isFile){ + JSONArray fileTable = new JSONArray(); //流程附件Table + //文件属性附件处理 + int fileIndex = 1; + ArrayList isNumberAscArray = new ArrayList(); + if (search != null && search.size() > 0) { + // 复制附件 + for (UpfileModel upfileModel : search) { + if (!"f".equals(upfileModel.getType())) {// 文件 + continue; } - String numberStr = fileNamel.substring(2,indexOf2); - if(isNumeric(numberStr)&&UtilString.isNotEmpty(numberStr)) { - isNumberAscArray.add("true"); - int fileNumber = Integer.parseInt(numberStr); - object.put("file_number", fileNumber); + // 复制doccenter下的文件 + DCContext dcContext = null; + DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE); + if (dcProfile != null) { + dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName()); + } + File sourceFile = new UtilFile(dcContext.getFilePath()); + File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName()); + try { + UtilFile.copyFile(sourceFile, targetFile); + } catch (Exception e) { + System.out.println(e); + e.printStackTrace(); + } + JSONObject object = new JSONObject(); + //按照附件编号排序 + String fileNamel= upfileModel.getFileName(); + if(UtilString.isNotEmpty(fileNamel)&&fileNamel.contains("附件")&&fileNamel.length()>2&&(fileNamel.contains(":")||fileNamel.contains(":"))) { + if(fileNamel.indexOf("附件")==0) { + int indexOf2 = 3; + if(fileNamel.contains(":")) { + indexOf2 = fileNamel.indexOf(":"); + }else if(fileNamel.contains(":")) { + indexOf2 = fileNamel.indexOf(":"); + } + String numberStr = fileNamel.substring(2,indexOf2); + if(isNumeric(numberStr)&&UtilString.isNotEmpty(numberStr)) { + isNumberAscArray.add("true"); + int fileNumber = Integer.parseInt(numberStr); + object.put("file_number", fileNumber); + }else { + isNumberAscArray.add("false"); + } + } + }else { isNumberAscArray.add("false"); } + String file_name; + if(upfileModel.getFileName().contains("--")){ + file_name=upfileModel.getFileName().replaceAll("--+|---", "-"); + }else{ + file_name=upfileModel.getFileName(); + } + object.put("file_name", file_name); + object.put("file_name", file_name); + String link = fileName + File.separator + upfileModel.getFileName(); + object.put("link", link); + fileTable.add(object); + fileIndex++; } - - }else { - isNumberAscArray.add("false"); } - String file_name; - if(upfileModel.getFileName().contains("--")){ - file_name=upfileModel.getFileName().replaceAll("--+|---", "-"); - }else{ - file_name=upfileModel.getFileName(); - } - object.put("file_name", file_name); - object.put("file_name", file_name); - String link = fileName + File.separator + upfileModel.getFileName(); - object.put("link", link); - fileTable.add(object); - fileIndex++; } - } return dataMap; }