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 7e086a16..60d7cfdb 100644 Binary files a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.doc and b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.doc differ diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml index 0b0c8700..30c0e139 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml @@ -3081,7 +3081,7 @@ RRUiEF0QxZioRCVJFEOxk3sOxZN7GkWu5+Ve63tqVJUFVrZ+lFrOomD45B77y9uCXlZYohWpcSVu - 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 @@ - - - - - - - - - - -