From 2fe1797f78ac81fb9b22df7d3e696188de0f8983 Mon Sep 17 00:00:00 2001 From: anhc <3442943606@qq.com> Date: Mon, 18 Jul 2022 15:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=A8=AA=E8=A1=A8=E6=89=8B?= =?UTF-8?q?=E5=86=8C=E9=A1=B9=E7=9B=AE=E5=86=85=E5=AE=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com.actionsoft.apps.coe.pal.output.pr.jar | Bin 60134 -> 62683 bytes .../pal/output/pr/report1/Report1Gener.java | 91 +++++++++--------- ...程手册2 - 副本.xml => 步骤横表-流程手册2.xml} | 61 ++++++------ 3 files changed, 78 insertions(+), 74 deletions(-) rename com.actionsoft.apps.coe.pal.output.pr/{步骤横表-流程手册2 - 副本.xml => 步骤横表-流程手册2.xml} (99%) diff --git a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar index a72dee1e3cdec0a2a3899081fd75cc5c6503d3a8..83e349ce558413f31686f1bc918b2fb9679336f2 100644 GIT binary patch delta 16941 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 delta 14457 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 z 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 WaPJK|IuR5R)D metrics = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "Process_performance_metrics"); - if (metrics.size() == 0) { - dataMap.put("pl_Name_process_performance_indicator", ""); - dataMap.put("pl_set_the_purpose", ""); - dataMap.put("pl_Index_definition", ""); - dataMap.put("pl_computational_formula", ""); - dataMap.put("pl_data_sources", ""); - dataMap.put("pl_unit_measurement", ""); - dataMap.put("pl_statistical_period", ""); - dataMap.put("pl_explain", ""); - - }else { + if (metrics.size() != 0) { for (DesignerShapeRelationModel relation : metrics) { String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID String relationShapeId = relation.getRelationShapeId();//实例ID @@ -285,15 +283,47 @@ public class Report1Gener { file.mkdir(); } } + + //文件属性附件处理 + int fileIndex = 1; + 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(); + object.put("file_name", fileIndex + "." + upfileModel.getFileName()); + String link = fileName + File.separator + upfileModel.getFileName(); + object.put("link", link); + fileTable.add(object); + fileIndex++; + } + } + //流程说明 if (repositoryFileElements != null) { int index = 1;// 流程步骤序号 int dangerIndex = 1;// 风险序号 int regulateIndex = 1;// 控制序号 for (Map shape : repositoryFileElements) { //如果图形元素不是流程步骤,不导出该元素 - if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1 && "method_approval_node,method_service_node,method_manual_node".indexOf((String)shape.get("type")) == -1) { - continue; - } +// if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1 && "method_approval_node,method_service_node,method_manual_node".indexOf((String)shape.get("type")) == -1) { +// continue; +// } JSONObject _tr = new JSONObject(); OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr); //设置默认值 _tr.put(OutputWordUtil.SERIAL_NUMBER, index); //序号 @@ -333,10 +363,11 @@ public class Report1Gener { e.printStackTrace(); } JSONObject object = new JSONObject(); - object.put("shape_file_name", upfileModel.getFileName()); + object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName()); String link = fileName + File.separator + upfileModel.getFileName(); object.put("shape_file_link", link); shapeFileTable.add(object); + fileIndex++; } } if(shapeFileTable.size() == 0) {// 没有附件时给空值,不然使用office打开会解析错误 @@ -385,36 +416,6 @@ public class Report1Gener { // 流程步骤的指标表格 setTableValueOfKPI("kpi", repositoryId, KPITable, relationFileMap); - if (search != null && search.size() > 0) { - // 复制附件 - int index = 1; - 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(); - object.put("file_name", index + "." + upfileModel.getFileName()); - String link = fileName + File.separator + upfileModel.getFileName(); - object.put("link", link); - fileTable.add(object); - index++; - } - } - JSONArray termTable = new JSONArray(); //术语定义Table // 属性特征 属性代码KEY PALRepositoryPropertyModel term = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"term"); diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2 - 副本.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml similarity index 99% rename from com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2 - 副本.xml rename to com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml index 02412b7d..b8af015d 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2 - 副本.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml @@ -4932,6 +4932,7 @@ y7fdOgAAAABJRU5ErkJggk== + ${pl_diagram} @@ -4939,7 +4940,7 @@ y7fdOgAAAABJRU5ErkJggk== ${pl_diagram} - + @@ -5607,7 +5608,7 @@ y7fdOgAAAABJRU5ErkJggk== - ${table2.shape_activity_description} + ${table2.shape_name} @@ -6856,6 +6857,7 @@ y7fdOgAAAABJRU5ErkJggk== + ${table4.file_name} @@ -6863,33 +6865,34 @@ y7fdOgAAAABJRU5ErkJggk== <#list repository_shape_table as table1> - <#list table1.shape_File_Table as table11> - - - - - - - - - - - - - - - - - - - - - ${table11.shape_file_name} - - - - - + <#list table1.shape_File_Table as table11> + + + + + + + + + + + + + + + + + + + + + + ${table11.shape_file_name} + + + + +