From 2ee86fdec394d1e1d4d64a514e93a35e89bb3add Mon Sep 17 00:00:00 2001
From: lihongyu <504404568@qq.com>
Date: Fri, 14 Oct 2022 20:38:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=89=8B=E5=86=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=99=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pal/output/bd/report1/Report1Gener.java   | 11 ++++
 .../表单-手册2.xml                            | 66 +++++++++++++++++++
 2 files changed, 77 insertions(+)

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<String> 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==
 				</w:tr>
                 </#list>
 			</w:tbl>
+			
+			
 			<wx:sub-section>
 				<w:p wsp:rsidR="00546297" wsp:rsidRPr="001A7475" wsp:rsidRDefault="00AC2941" wsp:rsidP="001A7475">
 					<w:pPr>
@@ -3550,6 +3552,70 @@ y7fdOgAAAABJRU5ErkJggk==
 					</w:hlink>
 				</w:p>
                 </#list>
+                </#if>
+			</wx:sub-section>
+			<wx:sub-section>
+				<w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
+					<w:pPr>
+						<w:pStyle w:val="1"/>
+						<w:listPr>
+							<w:ilvl w:val="0"/>
+							<w:ilfo w:val="2"/>
+							<wx:t wx:val="7."/>
+							<wx:font wx:val="Times New Roman"/>
+						</w:listPr>
+						<w:rPr>
+							<w:lang w:val="EN-US"/>
+						</w:rPr>
+					</w:pPr>
+					<aml:annotation aml:id="38" w:type="Word.Bookmark.Start" w:name="_Toc114156671"/>
+					<w:r>
+						<w:rPr>
+							<w:rFonts w:hint="fareast"/>
+							<w:lang w:val="EN-US"/>
+						</w:rPr>
+						<w:t>附则</w:t>
+					</w:r>
+					<aml:annotation aml:id="38" w:type="Word.Bookmark.End"/>
+				</w:p>
+                <#if (T_supplementary_articles_count == 0 )>
+				<w:p wsp:rsidR="002737AF" wsp:rsidRPr="00741391" wsp:rsidRDefault="002737AF" wsp:rsidP="00741391">
+					<w:pPr>
+						<w:spacing w:line="360" w:line-rule="auto"/>
+						<w:rPr>
+							<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+							<wx:font wx:val="宋体"/>
+						</w:rPr>
+					</w:pPr>
+					<w:r wsp:rsidRPr="00741391">
+						<w:rPr>
+							<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+							<wx:font wx:val="宋体"/>
+						</w:rPr>
+						<w:t>无</w:t>
+					</w:r>
+				</w:p>
+                <#else>
+				<#list T_supplementary_articles_table as table1>
+				<w:p wsp:rsidR="002737AF" wsp:rsidRPr="00741391" wsp:rsidRDefault="002737AF" wsp:rsidP="00741391">
+					<w:pPr>
+						<w:spacing w:line="360" w:line-rule="auto"/>
+						<w:ind w:first-line-chars="200" w:first-line="480"/>
+						<w:rPr>
+							<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+							<wx:font wx:val="宋体"/>
+							<w:b-cs/>
+						</w:rPr>
+					</w:pPr>
+					<w:r wsp:rsidRPr="00741391">
+						<w:rPr>
+							<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+							<wx:font wx:val="宋体"/>
+						</w:rPr>
+						<w:t>${table1}</w:t>
+					</w:r>
+				</w:p>
+				</#list>
                 </#if>
 			</wx:sub-section>
 			<w:sectPr wsp:rsidR="00140F58" wsp:rsidRPr="000F6912" wsp:rsidSect="005D1AAE">