From 0428f7eb9bd2e621c55dbfc9c13995a3d36b820e Mon Sep 17 00:00:00 2001 From: zhaol <15900249928@163.com> Date: Thu, 8 May 2025 14:41:28 +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=B6=E5=BA=A6=E3=80=81=E6=96=B9=E6=A1=88=E7=B1=BB=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=87=BA=E6=98=BE=E7=A4=BA=E6=89=8B=E5=86=8C?= =?UTF-8?q?+=E9=99=84=E4=BB=B6?= 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 80802 -> 82536 bytes .../pal/output/zd/report1/Report1Gener.java | 92 ++++++++++++++++++ 2 files changed, 92 insertions(+) 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 9a55e4cf75a3d90e03879dcd550702b5b911f602..31a1c4658d7d5ff1f95b1ba577b787888323d01d 100644 GIT binary patch delta 13597 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 Lpxgdxf`R>ipH;vo delta 11893 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 G5dRMlqU3V` 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 f4c17750..8258cfaa 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 @@ -1,5 +1,6 @@ package com.awspaas.apps.coe.pal.output.zd.report1; +import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.pal.output.extend.GenerLogExd; import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppManager; import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile; @@ -11,14 +12,21 @@ import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryPropertyCache; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel; +import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant; +import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao; +import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil; +import com.actionsoft.apps.coe.pal.util.HighSecurityUtil; +import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; import com.actionsoft.bpms.bo.engine.BO; import com.actionsoft.bpms.commons.formfile.model.delegate.FormFile; import com.actionsoft.bpms.commons.mvc.view.ResponseObject; import com.actionsoft.bpms.server.DispatcherRequest; import com.actionsoft.bpms.server.UserContext; import com.actionsoft.bpms.server.fs.DCContext; +import com.actionsoft.bpms.server.fs.dc.DCProfileManager; import com.actionsoft.bpms.util.UtilDate; +import com.actionsoft.bpms.util.UtilFile; import com.actionsoft.bpms.util.UtilString; import com.actionsoft.sdk.local.SDK; import com.actionsoft.sdk.local.api.internal.PlatformAPIImpl; @@ -237,6 +245,90 @@ public class Report1Gener { // 修订记录 dataMap.put("version_history_table", getVersionHistoryTable(repositoryModel)); + + // 流程附件列表 + UpFileDao upFileDao = new UpFileDao(); + StringBuffer sqlWhere = new StringBuffer(); + sqlWhere.append(" and PALREPOSITORYID ='").append(repositoryModel.getId()).append("'").append(" ORDER BY FILENAME ASC"); + List search = upFileDao.search(sqlWhere.toString()); + File file = null; + //三员管理下,用户密级与文件密级过滤显示 + if(HighSecurityUtil.isON()){ + PALRepositoryQueryAPIManager.getInstance().upFileSecurityFilter(this.userContext,search); + } + if (search != null && search.size() > 0) { + //创建附件目录及复制附件 + fileName = fileName + "_file"; + file = new File(docPath, fileName); + if (!file.exists()) { + log.info("创建附件"); + file.mkdir(); + } + } + + 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(":"); + } + 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++; + } + } + return dataMap; }