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 a72dee1e..83e349ce 100644 Binary files a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar and b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar differ diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index 8f7412aa..ed6c9726 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -192,18 +192,16 @@ public class Report1Gener { PALRepositoryModel repositoryModel = PALRepositoryQueryAPIManager.getInstance().queryPalRepositoryModelByPalId(repositoryId); //流程绩效 + 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", ""); List 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} + + + + +