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 1bf908dc..f402ebfa 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 21470085..13697255 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 @@ -368,10 +368,10 @@ public class Report1Gener { e.printStackTrace(); } JSONObject object = new JSONObject(); - object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName()); + object.put("file_name", fileIndex+"."+upfileModel.getFileName()); String link = fileName + File.separator + upfileModel.getFileName(); - object.put("shape_file_link", link); - shapeFileTable.add(object); + object.put("link", link); + fileTable.add(object); fileIndex++; } } @@ -530,7 +530,7 @@ public class Report1Gener { dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable); dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size()); dataMap.put("file_table", fileTable); - dataMap.put("file_table_count", fileIndex); + dataMap.put("file_table_count", fileTable.size()); dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable); dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable); dataMap.put(OutputWordUtil.TABLE_KPI, KPITable); 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 7e998bde..7d963b7f 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 @@ -347,10 +347,10 @@ public class Report2Gener { e.printStackTrace(); } JSONObject object = new JSONObject(); - object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName()); + object.put("file_name", fileIndex+"."+upfileModel.getFileName()); String link = fileName + File.separator + upfileModel.getFileName(); - object.put("shape_file_link", link); - shapeFileTable.add(object); + object.put("link", link); + fileTable.add(object); fileIndex++; } } @@ -509,7 +509,7 @@ public class Report2Gener { dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable); dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size()); dataMap.put("file_table", fileTable); - dataMap.put("file_table_count", fileIndex); + dataMap.put("file_table_count", fileTable.size()); dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable); dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable); dataMap.put(OutputWordUtil.TABLE_KPI, KPITable); diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml index 154844d2..b5607b6b 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml @@ -7206,7 +7206,7 @@ y7fdOgAAAABJRU5ErkJggk== - <#if (file_table_count == 1 )> + <#if (file_table_count == 0 )> @@ -7240,29 +7240,6 @@ y7fdOgAAAABJRU5ErkJggk== - <#list repository_shape_table as table1> - <#list table1.shape_File_Table as table11> - - - - - - - - - - - - - - - - ${table11.shape_file_name} - - - - - diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册4.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册4.xml index d54f26de..f9130cae 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册4.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册4.xml @@ -6979,7 +6979,7 @@ y7fdOgAAAABJRU5ErkJggk== - <#if (file_table_count == 1 )> + <#if (file_table_count == 0 )> @@ -7013,29 +7013,6 @@ y7fdOgAAAABJRU5ErkJggk== - <#list repository_shape_table as table1> - <#list table1.shape_File_Table as table11> - - - - - - - - - - - - - - - - ${table11.shape_file_name} - - - - -