From e172ef446586d5e3dfe1a84ee3d70eafb6950d10 Mon Sep 17 00:00:00 2001 From: anhc <3442943606@qq.com> Date: Tue, 19 Jul 2022 17:10:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=89=8B=E5=86=8C=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E6=A8=AA=E8=A1=A8=20=E7=BB=A9=E6=95=88=E6=8C=87?= =?UTF-8?q?=E6=A0=87table=20=E5=A4=9A=E6=8C=87=E6=A0=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com.actionsoft.apps.coe.pal.output.pr.jar | Bin 67141 -> 67198 bytes .../pal/output/pr/report1/Report1Gener.java | 59 +- .../步骤横表-流程手册2.xml | 972 +++++++++--------- 3 files changed, 503 insertions(+), 528 deletions(-) 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 1d4c147ae312cfc8859c9f4c2982951db9f521b5..a663a039e73bc15e57d9b3393795e65192dae043 100644 GIT binary patch delta 12534 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 delta 12319 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 U&`vY|r4`^Hncyg&|8Due0B^IN$p8QV 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 78227fc5..b197a9e2 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,22 +192,20 @@ 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", ""); + 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); @@ -216,33 +214,35 @@ public class Report1Gener { //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; @@ -503,33 +503,6 @@ public class Report1Gener { } } - - - //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 2fa6731d..35f5d870 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml @@ -5845,24 +5845,25 @@ y7fdOgAAAABJRU5ErkJggk== <#if (metrics_count ==0 )> - - - - - - - - - - - - - - 无 - - + + + + + + + + + + + + + + 无 + + <#else> - + <#list pl_process_kpi_list as proKpis> + @@ -5874,474 +5875,475 @@ y7fdOgAAAABJRU5ErkJggk== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 指标名称 - - - - - - - - - - - - - - - - - - - - - - - - - ${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} - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 指标名称 + + + + + + + + + + + + + + + + + + + + + + + + + ${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} + + + + + + +