From 917a8015805fe82414e172bae6499c7c07875524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=9F=E6=9E=97=E5=B8=86?= Date: Thu, 7 Jul 2022 15:42:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B5=81=E7=A8=8B=E6=89=8B=E5=86=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pal/output/pr/report1/Report1Gener.java | 64 ++- .../步骤横表-流程手册2.doc | Bin 301568 -> 302080 bytes .../步骤横表-流程手册2.xml | 511 +++++++----------- .../表单-手册(修订版).xml | 6 +- .../制度-手册(修改中).xml | 306 +++-------- 5 files changed, 320 insertions(+), 567 deletions(-) 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 b99786d4..ca9e8432 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 @@ -180,31 +180,70 @@ public class Report1Gener { */ private JSONObject getData(String repositoryId, JSONObject wizardJsonData, String docPath, String fileName) { JSONObject dataMap = new JSONObject(); - dataMap.put("organizationType", "涉及部门及岗位\\角色"); boolean raciRelationType = SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal.output.pr", "DETY_POSITION_ROLE_RELATION_TYPE", false); - // 记录关联属性的流程节点，防止多次查询重复文件信息耗费时间 + // 记录关联属性的流程节点，防止多次查询重复文件信息耗费时间 Set relationFileIds = new HashSet<>(); Map> relationFileMap = new HashMap<>(); PrReportComment prReportComment = new PrReportComment(); PALRepositoryModel repositoryModel = PALRepositoryQueryAPIManager.getInstance().queryPalRepositoryModelByPalId(repositoryId); + + //流程绩效 + List metrics = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "Process_performance_metrics"); + for (DesignerShapeRelationModel relation : metrics) { + 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) { + Object attributes = entry.get("attributes"); + String resultJson = attributes.toString(); + JSONArray object= JSONArray.parseArray(resultJson); + for(int i=0; i dangerSet = new HashSet();// 风险 Set regulateSet = new HashSet();// 控制 Set KPISet = new HashSet();// kpi - //System.out.println("id======================="+repositoryId); - List> repositoryFileElements = CoeDesignerUtil.getShapeMessageJson4(repositoryId); //流程文件内容 if (wizardJsonData.getBoolean("orderNuberFirst")) { // 根据页面选择进行排序 OutputWordUtil.orderByNumber(repositoryFileElements); @@ -441,6 +480,16 @@ public class Report1Gener { } + + //System.out.println(relations+"==========relations"); + /*if (wizardJsonData.getBoolean("orderNuberFirst")) { // 根据页面选择进行排序 + OutputWordUtil.orderByNumber(relations); + }*/ + + + + + // 2张表 // 文件属性内容（文本内容）表 // 文件属性内容关联表 @@ -465,6 +514,9 @@ public class Report1Gener { dataMap.put("supports_table", supportfiles);//table6 //相关文件 dataMap.put("relevant_table", relevant_flies);//table7 + //流程绩效 + //dataMap.put("Process_performance_metrics_table",process_performance_metrics);//table8 + dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable); dataMap.put("file_table", fileTable); dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable); diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.doc b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.doc index 7e086a16ba903fd7e7b639860ffba83f924d4dc0..60d7cfdbbeee296cb79671dbef074537c76495a1 100644 GIT binary patch delta 6080 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 R__*5mOS#p!c91vl{{b^hvb_KR delta 5868 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 X - 11.01.02.00/T01V1.0-YLYYYY + ${pl_file_number} @@ -5916,23 +5916,36 @@ y7fdOgAAAABJRU5ErkJggk== - + - + + + - - - - 2术语 + 2 - + + . + + + 术语 + + + + + + + + + + @@ -5949,22 +5962,22 @@ y7fdOgAAAABJRU5ErkJggk== - - + + - + - + - + @@ -5984,13 +5997,13 @@ y7fdOgAAAABJRU5ErkJggk== - + - + @@ -6009,16 +6022,17 @@ y7fdOgAAAABJRU5ErkJggk== - + <#list term_table as table4> + - + - + @@ -6029,52 +6043,24 @@ y7fdOgAAAABJRU5ErkJggk== + + + + + + + + + ${table4.name} + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -6083,33 +6069,46 @@ y7fdOgAAAABJRU5ErkJggk== + + + + + + + + ${table4.desc} + + - + - - - - - - - - - + + + + 3.组织/角色与职责 - + + + + + + + + + @@ -6121,7 +6120,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -6136,7 +6135,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -6150,30 +6149,7 @@ y7fdOgAAAABJRU5ErkJggk== - 组织 - - - - - - - / - - - - - - - - 角色 - - - - - - - - 名称 + 组织/角色名称 @@ -6188,7 +6164,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -6207,7 +6183,8 @@ y7fdOgAAAABJRU5ErkJggk== - + <#list organization_table as table5> + @@ -6221,7 +6198,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -6229,6 +6206,15 @@ y7fdOgAAAABJRU5ErkJggk== + + + + + + + ${table5.name} + + @@ -6241,60 +6227,24 @@ y7fdOgAAAABJRU5ErkJggk== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + ${table5.desc} + + @@ -6931,6 +6881,7 @@ y7fdOgAAAABJRU5ErkJggk== + @@ -6987,11 +6938,12 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_Process_performance_metrics} + ${pl_statistical_period} + @@ -7052,11 +7004,12 @@ y7fdOgAAAABJRU5ErkJggk== - 设置该指标的目的，例如：促进成本降低、效率提升等 + ${pl_unit_measurement} + @@ -7117,11 +7070,12 @@ y7fdOgAAAABJRU5ErkJggk== - shape_Index + ${pl_data_sources} + @@ -7178,11 +7132,12 @@ y7fdOgAAAABJRU5ErkJggk== - shape_calculation_method + ${pl_computational_formula} + @@ -7243,11 +7198,12 @@ y7fdOgAAAABJRU5ErkJggk== - shape_sources + ${pl_Index_definition} + @@ -7307,11 +7263,12 @@ y7fdOgAAAABJRU5ErkJggk== - shape_measurement + ${pl_objective} + @@ -7371,11 +7328,12 @@ y7fdOgAAAABJRU5ErkJggk== - shape_period + ${pl_Name_process_performance_indicatort} + @@ -7436,55 +7394,55 @@ y7fdOgAAAABJRU5ErkJggk== - shape_remark + ${pl_explain} + - + - - - + + + + - + + + + + + 5 + + + + + + . + + 相关文件 - + - + - - - - - - + - - - - - - - - - - @@ -7497,7 +7455,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -7512,7 +7470,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -7541,7 +7499,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -7560,56 +7518,8 @@ y7fdOgAAAABJRU5ErkJggk== - - - - - - - - - - - - - - - - - - - - - - - 1.0 - - - - - - - - - - - - - - - - - - - - - - ${pl_R_relevant_flies} - - - - - + <#list supports_table as table6> + @@ -7624,7 +7534,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -7632,6 +7542,13 @@ y7fdOgAAAABJRU5ErkJggk== + + + + + + ${table6.desc} + @@ -7643,48 +7560,59 @@ y7fdOgAAAABJRU5ErkJggk== - - + + + + + + + + + ${table6.name} + + - + + + + + + + + + + + - - + + - - - + - - - - + - 支持 + 6.支持文件 - - 文件 - - + - + @@ -7706,7 +7634,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -7721,7 +7649,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -7750,7 +7678,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -7769,56 +7697,8 @@ y7fdOgAAAABJRU5ErkJggk== - - - - - - - - - - - - - - - - - - - - - - - 1.0 - - - - - - - - - - - - - - - - - - - - - - ${pl_relevant_flies} - - - - - + <#list relevant_table as table7> + @@ -7831,9 +7711,8 @@ y7fdOgAAAABJRU5ErkJggk== - - + @@ -7841,6 +7720,13 @@ y7fdOgAAAABJRU5ErkJggk== + + + + + + ${table7.desc} + @@ -7852,30 +7738,21 @@ y7fdOgAAAABJRU5ErkJggk== - - - + + - + + - + ${table7.name} + + - - - - - - - - - - - diff --git a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml index 9f8b8d63..cbaa17e0 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml +++ b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml @@ -3974,6 +3974,7 @@ y7fdOgAAAABJRU5ErkJggk== + <#list history_table as table6> @@ -3998,7 +3999,7 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_P_versions} + ${table6.history_no} @@ -4191,11 +4192,12 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_Contents_and_reasons_for_revision} + ${table6.history_modifyContent} + diff --git a/com.awspaas.user.apps.coe.pal.output.zd/制度-手册(修改中).xml b/com.awspaas.user.apps.coe.pal.output.zd/制度-手册(修改中).xml index b4a82a6a..69289695 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/制度-手册(修改中).xml +++ b/com.awspaas.user.apps.coe.pal.output.zd/制度-手册(修改中).xml @@ -4010,6 +4010,7 @@ + <#list term_table as table4> @@ -4038,17 +4039,7 @@ - 1 - - - - - - - - - - 2 + ${table4.name} @@ -4073,58 +4064,12 @@ - 3 - - - - - - - - - 4 + ${table4.desc} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -4141,19 +4086,7 @@ - 3 - - - . - - - - - - 组织/ - - - 角色与职责 + 3.组织/角色与职责 @@ -4204,30 +4137,7 @@ - 组织 - - - - - - - / - - - - - - - - 角色 - - - - - - - - 名称 + 组织/角色名称 @@ -4261,6 +4171,7 @@ + <#list organization_table as table5> @@ -4289,14 +4200,7 @@ - 5 - - - - - - - 6 + ${table5.name} @@ -4323,66 +4227,16 @@ - 7 - - - - - - - 8 + ${table5.desc} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -4390,20 +4244,14 @@ - + - 4 + 4.内容 - - . - - - 内容 - - + @@ -4413,6 +4261,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${pl_content} + + + + + @@ -4530,6 +4420,7 @@ + <#list supports_table as table6> @@ -4558,14 +4449,7 @@ - 3 - - - - - - - 3 + ${table6.desc} @@ -4593,65 +4477,12 @@ - 4 - - - - - - - - 4 + ${table6.name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -4780,6 +4611,7 @@ + <#list relevant_table as table7> @@ -4807,7 +4639,7 @@ - 20 + ${table7.desc} @@ -4828,11 +4660,12 @@ - 30 + ${table7.name} + @@ -4880,17 +4713,6 @@ - - - - - - - - - - -