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 c791ae6a..9c50cd2c 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 547df1c0..d71df859 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 @@ -616,7 +616,7 @@ public class Report1Gener { //支持文件 - JSONArray supportfiles = new JSONArray(); + JSONArray related_support_files = new JSONArray(); /*try { int count = 0; String sql = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '"+repositoryModel.getId()+"' and PROPERTYID = 'support_files'"; @@ -643,7 +643,7 @@ public class Report1Gener { //相关/支持文件 - List relationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "support_files"); + List relationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "related_support_files"); relationList.sort(Comparator.comparing(DesignerShapeRelationModel::getShapeText)); @@ -665,7 +665,7 @@ public class Report1Gener { JSONObject tmp = new JSONObject(); tmp.put("name", name); tmp.put("desc", index); - supportfiles.add(tmp); + related_support_files.add(tmp); } } @@ -785,8 +785,8 @@ public class Report1Gener { dataMap.put("organization_table", organizationTable);//table5 dataMap.put("organization_table_count",organizationTable.size());//table5 //支持文件 - dataMap.put("supports_table", supportfiles);//table6 - dataMap.put("supports_table_count", supportfiles.size());//table6 + dataMap.put("related_support_files_table", related_support_files);//table6 + dataMap.put("related_support_files_table_count", related_support_files.size());//table6 //相关文件 /*dataMap.put("relevant_table", relevant_flies);//table7 dataMap.put("relevant_table_count", relevant_flies.size());//table7*/ 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 48bd5399..254fa2b6 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 @@ -522,8 +522,8 @@ public class Report2Gener { dataMap.put("supports_table", supportfiles);//table6 dataMap.put("supports_table_count", supportfiles.size());//table6 //相关文件 - dataMap.put("relevant_table", relevant_flies);//table7 - dataMap.put("relevant_table_count", relevant_flies.size());//table7 + /*dataMap.put("relevant_table", relevant_flies);//table7 + dataMap.put("relevant_table_count", relevant_flies.size());//table7*/ //流程绩效 //dataMap.put("Process_performance_metrics_table",process_performance_metrics);//table8 dataMap.put("metrics_count", metrics.size());// diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml index a4933166..add522a8 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml @@ -6229,228 +6229,6 @@ y7fdOgAAAABJRU5ErkJggk== - <#if (criticalControlPointTableCount ==0 )> <#else> @@ -6797,7 +6575,7 @@ y7fdOgAAAABJRU5ErkJggk== -<#if (supports_table_count >0 )> +<#if (related_support_files_table_count >0 )> @@ -6818,7 +6596,7 @@ y7fdOgAAAABJRU5ErkJggk== -<#if (supports_table_count ==0 )> +<#if (related_support_files_table_count ==0 )> @@ -6936,7 +6714,7 @@ y7fdOgAAAABJRU5ErkJggk== - <#list supports_table as table7> + <#list related_support_files_table as table7>