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 f402ebfa..948bf747 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 13697255..203d5739 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 @@ -60,7 +60,7 @@ public class Report1Gener { private UserContext userContext = null; GenerLogExd log = new GenerLogExd(); //word换行符 - private final String WRAPSTRING = ""; + private final String WRAPSTRING = ""; public Report1Gener() { } @@ -511,6 +511,26 @@ public class Report1Gener { // 修订记录 dataMap.put("version_history_table", getVersionHistoryTable(repositoryModel)); + // 附则处理 + List T_supplementary_articles_table = new ArrayList<>(); + String [] tmp = dataMap.getString("pl_T_supplementary_articles").split("\n"); + for (int i = 0; i < tmp.length; i++) { + if (UtilString.isNotEmpty(tmp[i])) { + T_supplementary_articles_table.add(tmp[i]); + } + } + dataMap.put("T_supplementary_articles_table", T_supplementary_articles_table);// 换行 + + // 目的处理 + List goal_table = new ArrayList<>(); + String [] tmp2 = dataMap.getString("pl_goal").split("\n"); + for (int i = 0; i < tmp2.length; i++) { + if (UtilString.isNotEmpty(tmp2[i])) { + goal_table.add(tmp2[i]); + } + } + dataMap.put("goal_table", goal_table); + //术语 dataMap.put("term_table", termTable);//table4 dataMap.put("term_table_count", termTable.size());//table4 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 7d963b7f..ed1dd143 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 @@ -58,7 +58,7 @@ public class Report2Gener { private UserContext userContext = null; GenerLogExd log = new GenerLogExd(); //word换行符 - private final String WRAPSTRING = ""; + private final String WRAPSTRING = ""; public Report2Gener() { } @@ -490,6 +490,26 @@ public class Report2Gener { // 修订记录 dataMap.put("version_history_table", getVersionHistoryTable(repositoryModel)); + // 附则处理 + List T_supplementary_articles_table = new ArrayList<>(); + String [] tmp = dataMap.getString("pl_T_supplementary_articles").split("\n"); + for (int i = 0; i < tmp.length; i++) { + if (UtilString.isNotEmpty(tmp[i])) { + T_supplementary_articles_table.add(tmp[i]); + } + } + dataMap.put("T_supplementary_articles_table", T_supplementary_articles_table);// 换行 + + // 目的处理 + List goal_table = new ArrayList<>(); + String [] tmp2 = dataMap.getString("pl_goal").split("\n"); + for (int i = 0; i < tmp2.length; i++) { + if (UtilString.isNotEmpty(tmp2[i])) { + goal_table.add(tmp2[i]); + } + } + dataMap.put("goal_table", goal_table); + //术语 dataMap.put("term_table", termTable);//table4 dataMap.put("term_table_count", termTable.size());//table4 diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.doc b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.doc index 55c536bf..76628167 100644 Binary files a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.doc and b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.doc differ diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml index b5607b6b..2ddd7e74 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml @@ -4250,6 +4250,7 @@ y7fdOgAAAABJRU5ErkJggk== + <#list goal_table as table1> @@ -4263,9 +4264,10 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_goal} + ${table1} + @@ -5483,7 +5485,7 @@ y7fdOgAAAABJRU5ErkJggk== - ${table2.shape_activity_description} + ${table2.shape_name} @@ -7155,8 +7157,10 @@ y7fdOgAAAABJRU5ErkJggk== - + <#list T_supplementary_articles_table as table1> + + @@ -7168,9 +7172,10 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_T_supplementary_articles} + ${table1} + diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册4.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册4.xml index f9130cae..cb658132 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册4.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册4.xml @@ -4311,6 +4311,7 @@ y7fdOgAAAABJRU5ErkJggk== + <#list goal_table as table1> @@ -4324,9 +4325,10 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_goal} + ${table1} + @@ -6926,6 +6928,7 @@ y7fdOgAAAABJRU5ErkJggk== + <#list T_supplementary_articles_table as table1> @@ -6940,9 +6943,10 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_T_supplementary_articles} + ${table1} + diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java index b4bf09e5..7eceb3db 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java @@ -55,7 +55,7 @@ public class Report1Gener { private UserContext userContext = null; GenerLogExd log = new GenerLogExd(); //word换行符 - private final String WRAPSTRING = ""; + private final String WRAPSTRING = ""; public Report1Gener() { } diff --git a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar index 97829304..28f5ea0a 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar and b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar differ diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index ddce6dcd..35cc4e38 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -62,7 +62,7 @@ public class Report1Gener { private UserContext userContext = null; GenerLogExd log = new GenerLogExd(); //word换行符 - private final String WRAPSTRING = ""; + private final String WRAPSTRING = ""; public Report1Gener() { } @@ -663,9 +663,27 @@ public class Report1Gener { // 修订记录 dataMap.put("version_history_table", getVersionHistoryTable(repositoryModel)); // 附则处理 - dataMap.put("T_supplementary_articles_count", dataMap.getString("pl_T_supplementary_articles").length()); + List T_supplementary_articles_table = new ArrayList<>(); + String [] tmp = dataMap.getString("pl_T_supplementary_articles").split("\n"); + for (int i = 0; i < tmp.length; i++) { + if (UtilString.isNotEmpty(tmp[i])) { + T_supplementary_articles_table.add(tmp[i]); + } + } + dataMap.put("T_supplementary_articles_table", T_supplementary_articles_table);// 换行 + dataMap.put("T_supplementary_articles_count", T_supplementary_articles_table.size()); + // 目的处理 - dataMap.put("Purpose_count", dataMap.getString("pl_Purpose").length()); + List Purpose_table = new ArrayList<>(); + String [] tmp2 = dataMap.getString("pl_Purpose").split("\n"); + for (int i = 0; i < tmp2.length; i++) { + if (UtilString.isNotEmpty(tmp2[i])) { + Purpose_table.add(tmp2[i]); + } + } + dataMap.put("Purpose_count", Purpose_table.size()); + dataMap.put("Purpose_table", Purpose_table); + // 条款word xml内容处理 dataMap.put("control_content_count", contentXml.length()); dataMap.put("control_content", contentXml); diff --git a/com.awspaas.user.apps.coe.pal.output.zd/制度-手册4.xml b/com.awspaas.user.apps.coe.pal.output.zd/制度-手册4.xml index 5c2b4b99..862f408f 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/制度-手册4.xml +++ b/com.awspaas.user.apps.coe.pal.output.zd/制度-手册4.xml @@ -5723,6 +5723,7 @@ y7fdOgAAAABJRU5ErkJggk== <#else> + <#list Purpose_table as table1> @@ -5740,9 +5741,10 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_Purpose} + ${table1} + @@ -6612,6 +6614,7 @@ y7fdOgAAAABJRU5ErkJggk== <#else> + <#list T_supplementary_articles_table as table1> @@ -6627,9 +6630,10 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_T_supplementary_articles} + ${table1} +