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 7eceb3db..0179055d 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 @@ -371,6 +371,17 @@ 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);// 换行 + dataMap.put("T_supplementary_articles_count", T_supplementary_articles_table.size()); return dataMap; } diff --git a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml index 9c5f9503..a0af909c 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml +++ b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml @@ -3487,6 +3487,8 @@ y7fdOgAAAABJRU5ErkJggk== + + @@ -3550,6 +3552,70 @@ y7fdOgAAAABJRU5ErkJggk== + + + + + + + + + + + + + + + + + + + + + + + 附则 + + + + <#if (T_supplementary_articles_count == 0 )> + + + + + + + + + + + + + + + + + <#else> + <#list T_supplementary_articles_table as table1> + + + + + + + + + + + + + + + + ${table1} + + +