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 a663a039..2186fd16 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/report2/Report2Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java index 52762e35..fbc4bd13 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java @@ -171,22 +171,20 @@ public class Report2Gener { 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", ""); + JSONArray processKpi = new JSONArray(); List metrics = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "Process_performance_metrics"); if (metrics.size() != 0) { for (DesignerShapeRelationModel relation : metrics) { + JSONObject processObj = new JSONObject(); String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID String relationShapeId = relation.getRelationShapeId();//实例ID //System.out.println(relationFileId + "/" + relationShapeId);//输出响应ID List> relations = CoeDesignerUtil.getShapeMessageJson4(relationFileId); //流程文件内容 for (Map entry : relations) { + String id = (String)entry.get("id"); + if (id == null || !id.equals(relationShapeId)){ + continue; + } Object attributes = entry.get("attributes"); String resultJson = attributes.toString(); JSONArray object= JSONArray.parseArray(resultJson); @@ -195,33 +193,35 @@ public class Report2Gener { //if (key.equals("explain") || key.equals("statistical_period") || key.equals("unit_measurement") || key.equals("data_sources") || key.equals("computational_formula") || key.equals("Index_definition") || key.equals("objective") || key.equals("Name_process_performance_indicator")) { if (key.equals("Name_process_performance_indicator")){//指标名称 Name_process_performance_indicator String value = object.getJSONObject(i).getString("value"); - dataMap.put("pl_Name_process_performance_indicator", value); + processObj.put("pl_Name_process_performance_indicator", value); }else if (key.equals("set_the_purpose")){//设置目的 set_the_purpose String value = object.getJSONObject(i).getString("value"); - dataMap.put("pl_set_the_purpose", value); + processObj.put("pl_set_the_purpose", value); }else if (key.equals("Index_definition")){//指标定义 Index_definition String value = object.getJSONObject(i).getString("value"); - dataMap.put("pl_Index_definition", value); + processObj.put("pl_Index_definition", value); }else if (key.equals("computational_formula")){//计算公式 computational_formula String value = object.getJSONObject(i).getString("value"); - dataMap.put("pl_computational_formula", value); + processObj.put("pl_computational_formula", value); }else if (key.equals("data_sources")){//数据来源 data_sources String value = object.getJSONObject(i).getString("value"); - dataMap.put("pl_data_sources", value); + processObj.put("pl_data_sources", value); }else if (key.equals("unit_measurement")){//计量单位 unit_measurement String value = object.getJSONObject(i).getString("value"); - dataMap.put("pl_unit_measurement", value); + processObj.put("pl_unit_measurement", value); }else if (key.equals("statistical_period")){//统计周期 statistical_period String value = object.getJSONObject(i).getString("value"); - dataMap.put("pl_statistical_period", value); + processObj.put("pl_statistical_period", value); }else if (key.equals("explain")){//说 明 explain String value = object.getJSONObject(i).getString("value"); - dataMap.put("pl_explain", value); + processObj.put("pl_explain", value); } } } + processKpi.add(processObj); } } + dataMap.put("pl_process_kpi_list",processKpi); dataMap.put("organizationType", "涉及部门及岗位\\角色"); if (repositoryModel == null) { return null; @@ -482,33 +482,6 @@ public class Report2Gener { } } - - - //System.out.println(relations+"==========relations"); - /*if (wizardJsonData.getBoolean("orderNuberFirst")) { // 根据页面选择进行排序 - OutputWordUtil.orderByNumber(relations); - }*/ - - - - - - // 2张表 - // 文件属性内容（文本内容）表 - // 文件属性内容关联表 - - // 根据绩效所属模型查询绩效形状的详细信息 - - - - // 流程文件属性术语与定义（表格类型） - - - - // 流程文件属性绩效形状的信息 - - // 流程文件属性相关文件和支持文件 - //术语 dataMap.put("term_table", termTable);//table4 dataMap.put("term_table_count", termTable.size());//table4 diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册2.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册2.xml index b4b8b2df..17d22137 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册2.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册2.xml @@ -5748,7 +5748,7 @@ y7fdOgAAAABJRU5ErkJggk== <#if (metrics_count ==0 )> - + @@ -5765,486 +5765,488 @@ y7fdOgAAAABJRU5ErkJggk== <#else> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 指标名称 - - - - - - - - - - - - - - - - - - - - - - - - - ${pl_Name_process_performance_indicator} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 设置目的 - - - - - - - - - - - - - - - - - - - - - - ${pl_set_the_purpose} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 指标定义 - - - - - - - - - - - - - - - - - ${pl_Index_definition} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 计算公式 - - - - - - - - - - - - - - - - - ${pl_computational_formula} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 数据来源 - - - - - - - - - - - - - - - - - - - - - - - - - ${pl_data_sources} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 计量单位 - - - - - - - - - - - - - - - - - - - - - - - - - ${pl_unit_measurement} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 统计周期 - - - - - - - - - - - - - - - - - ${pl_statistical_period} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 说 - - - - - - - - - - - - - - - 明 - - - - - - - - - - - - - - - - - ${pl_explain} - - - - - - + <#list pl_process_kpi_list as proKpis> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 指标名称 + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_Name_process_performance_indicator} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 设置目的 + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_set_the_purpose} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 指标定义 + + + + + + + + + + + + + + + + + ${proKpis.pl_Index_definition} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 计算公式 + + + + + + + + + + + + + + + + + ${proKpis.pl_computational_formula} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数据来源 + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_data_sources} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 计量单位 + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_unit_measurement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 统计周期 + + + + + + + + + + + + + + + + + ${proKpis.pl_statistical_period} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 说 + + + + + + + + + + + + + + + 明 + + + + + + + + + + + + + + + + + ${proKpis.pl_explain} + + + + + + +