1.维护字段属性 表单图新增修订内容及理由字段。

2.完善手册代码

com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml

@@ -19,8 +19,8 @@
   <attribute key="Process_performance_metrics" title="流程绩效" type="relation" value="" ref="{&quot;method&quot;:&quot;control.kpi&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="activity_description" title="活动描述" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动描述" isRequired="true"/>  
   <attribute key="output" title="输出" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="R_relevant_flies" title="相关文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="R_relevant_flies" title="相关文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="相关文件" isRequired="false"/>  
-  <attribute key="support_files" title="支持文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="支持文件" isRequired="false"/>  
+  <attribute key="support_files" title="支持文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="支持文件" isRequired="false"/>  
   <attribute key="relevant_flies" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="input" title="输入" type="textarea" value="" desc="输入" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="relevant_demand" title="相关要求" type="relation" value="" desc="相关要求" isRequired="false" ref="{&quot;method&quot;:&quot;itsystem&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="false"/>  

com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java

@@ -88,8 +88,9 @@ public class Report1Gener {
 				// ----预处理、校验----
 				OutputAppProfile appModel = OutputAppManager.getProfile(model.getProfileId());
 				String tempPath = appModel.getAppContext().getPath();
-				String tempName = "步骤横表-流程手册2.xml";
+				//String tempName = "步骤横表-流程手册.xml";
-				log.info("begin...");
+			    String tempName = "步骤横表-流程手册2.xml";
+			    log.info("begin...");
 				log.info("-------------------");
 				// ----文件处理-----
 						genarateWord(tempPath, tempName, dcContext.getPath(), jsonObj);
@@ -201,43 +202,45 @@ public class Report1Gener {
 			dataMap.put("pl_unit_measurement", "");
 			dataMap.put("pl_statistical_period", "");
 			dataMap.put("pl_explain", "");
-		}
+
-		for (DesignerShapeRelationModel relation : metrics) {
+		}else {
-			String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
+			for (DesignerShapeRelationModel relation : metrics) {
-			String relationShapeId = relation.getRelationShapeId();//实例ID
+				String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
-			System.out.println(relationFileId + "/" + relationShapeId);//输出响应ID
+				String relationShapeId = relation.getRelationShapeId();//实例ID
-			List<Map<String, Object>> relations = CoeDesignerUtil.getShapeMessageJson4(relationFileId); //流程文件内容
+				//System.out.println(relationFileId + "/" + relationShapeId);//输出响应ID
-			for (Map<String, Object> entry : relations) {
+				List<Map<String, Object>> relations = CoeDesignerUtil.getShapeMessageJson4(relationFileId); //流程文件内容
-				Object attributes = entry.get("attributes");
+				for (Map<String, Object> entry : relations) {
-				String resultJson = attributes.toString();
+					Object attributes = entry.get("attributes");
-				JSONArray object= JSONArray.parseArray(resultJson);
+					String resultJson = attributes.toString();
-				for(int i=0; i<object.size(); i++) {
+					JSONArray object= JSONArray.parseArray(resultJson);
-					String key = object.getJSONObject(i).getString("key");
+					for(int i=0; i<object.size(); i++) {
-					//if (key.equals("explain") || key.equals("statistical_period") || key.equals("unit_measurement") || key.equals("data_sources") || key.equals("computational_formula") || key.equals("Index_definition") || key.equals("objective") || key.equals("Name_process_performance_indicator")) {
+						String key = object.getJSONObject(i).getString("key");
-					 if (key.equals("Name_process_performance_indicator")){//指标名称      Name_process_performance_indicator
+						//if (key.equals("explain") || key.equals("statistical_period") || key.equals("unit_measurement") || key.equals("data_sources") || key.equals("computational_formula") || key.equals("Index_definition") || key.equals("objective") || key.equals("Name_process_performance_indicator")) {
-						String value = object.getJSONObject(i).getString("value");
+						if (key.equals("Name_process_performance_indicator")){//指标名称      Name_process_performance_indicator
-						dataMap.put("pl_Name_process_performance_indicator", value);
+							String value = object.getJSONObject(i).getString("value");
-					}else if (key.equals("set_the_purpose")){//设置目的      set_the_purpose
+							dataMap.put("pl_Name_process_performance_indicator", value);
-						String value = object.getJSONObject(i).getString("value");
+						}else if (key.equals("set_the_purpose")){//设置目的      set_the_purpose
-						dataMap.put("pl_set_the_purpose", value);
+							String value = object.getJSONObject(i).getString("value");
-					}else if (key.equals("Index_definition")){//指标定义     Index_definition
+							dataMap.put("pl_set_the_purpose", value);
-						String value = object.getJSONObject(i).getString("value");
+						}else if (key.equals("Index_definition")){//指标定义     Index_definition
-						dataMap.put("pl_Index_definition", value);
+							String value = object.getJSONObject(i).getString("value");
-					}else if (key.equals("computational_formula")){//计算公式    computational_formula
+							dataMap.put("pl_Index_definition", value);
-						String value = object.getJSONObject(i).getString("value");
+						}else if (key.equals("computational_formula")){//计算公式    computational_formula
-						dataMap.put("pl_computational_formula", value);
+							String value = object.getJSONObject(i).getString("value");
-					}else if (key.equals("data_sources")){//数据来源     data_sources
+							dataMap.put("pl_computational_formula", value);
-						String value = object.getJSONObject(i).getString("value");
+						}else if (key.equals("data_sources")){//数据来源     data_sources
-						dataMap.put("pl_data_sources", value);
+							String value = object.getJSONObject(i).getString("value");
-					}else if (key.equals("unit_measurement")){//计量单位     unit_measurement
+							dataMap.put("pl_data_sources", value);
-						String value = object.getJSONObject(i).getString("value");
+						}else if (key.equals("unit_measurement")){//计量单位     unit_measurement
-						dataMap.put("pl_unit_measurement", value);
+							String value = object.getJSONObject(i).getString("value");
-					}else if (key.equals("statistical_period")){//统计周期      statistical_period
+							dataMap.put("pl_unit_measurement", value);
-						String value = object.getJSONObject(i).getString("value");
+						}else if (key.equals("statistical_period")){//统计周期      statistical_period
-						dataMap.put("pl_statistical_period", value);
+							String value = object.getJSONObject(i).getString("value");
-					}else if (key.equals("explain")){//说    明     explain
+							dataMap.put("pl_statistical_period", value);
-						String value = object.getJSONObject(i).getString("value");
+						}else if (key.equals("explain")){//说    明     explain
-						dataMap.put("pl_explain", value);
+							String value = object.getJSONObject(i).getString("value");
+							dataMap.put("pl_explain", value);
+						}
 					}
 				}
 			}
@@ -525,17 +528,24 @@ public class Report1Gener {
 
 		//术语
 		dataMap.put("term_table", termTable);//table4
+		dataMap.put("term_table_count", termTable.size());//table4
 		//组织和职责
 		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("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());//
 
 		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", fileTable.size());
 		dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable);
 		dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable);
 		dataMap.put(OutputWordUtil.TABLE_KPI, KPITable);

com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java

@@ -80,7 +80,23 @@ public class PrReportComment {
 		JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
 		for (int i = 0; i < propertyArr.size(); i++) {
 			JSONObject propertyObj = propertyArr.getJSONObject(i);
-			dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value")));
+			if (propertyObj.getString("key").equals("goal")) {
+				if (propertyObj.getString("value").equals("")) {
+					dataMap.put("pl_" + propertyObj.getString("key"), "无");
+				}else{
+					dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value")));
+				}
+			}
+			if(propertyObj.getString("key").equals("T_supplementary_articles")) {
+				if (propertyObj.getString("value").equals("")) {
+					dataMap.put("pl_" + propertyObj.getString("key"), "无");
+				}else{
+					dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value")));
+				}
+			}else{
+				dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value")));
+			}
+
 		}
 		// 责任人、责任部门单独处理，兼容流程手册中直接使用pl_key进行定义
 		boolean dutyRelationType = SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal.output.pr", "DUTY_DEPARTMENT_PERSON_RELATION_TYPE", false);

com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册.xml

@@ -4072,7 +4072,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_duty_r}</w:t>
+                  <w:t>table1.shape_duty_r</w:t>
                 </w:r>
               </w:p>
               <w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="00E54D8E">
@@ -4094,7 +4094,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_approval_a}</w:t>
+                  <w:t>table1.shape_approval_a</w:t>
                 </w:r>
               </w:p>
               <w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="00E54D8E">
@@ -4116,7 +4116,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_counselor_c}</w:t>
+                  <w:t>table1.shape_counselor_c</w:t>
                 </w:r>
               </w:p>
               <w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="00E54D8E">
@@ -4138,7 +4138,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_notify_i}</w:t>
+                  <w:t>table1.shape_notify_i</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -4178,7 +4178,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_desc}</w:t>
+                  <w:t>table1.shape_desc</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -4212,7 +4212,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_institution}</w:t>
+                  <w:t>table1.shape_institution</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -4246,7 +4246,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_danger}</w:t>
+                  <w:t>table1.shape_danger</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -4280,7 +4280,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_kpi}</w:t>
+                  <w:t>table1.shape_kpi</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -4314,7 +4314,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_form}</w:t>
+                  <w:t>table1.shape_form</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -4348,7 +4348,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_handle_time}</w:t>
+                  <w:t>table1.shape_handle_time</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -4382,7 +4382,7 @@
                     <w:sz w:val="22"/>
                     <w:sz-cs w:val="20"/>
                   </w:rPr>
-                  <w:t>${table1.shape_itsystem}</w:t>
+                  <w:t>table1.shape_itsystem</w:t>
                 </w:r>
               </w:p>
             </w:tc>

com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml

@@ -14,5 +14,6 @@
   <attribute key="approver" title="审批人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="form_effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="form_Scope_application" title="适用范围" type="string" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="Issuing_department" title="拟制/修订单位" type="string" value="" desc="拟制/修订单位" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> 
+  <attribute key="Issuing_department" title="拟制/修订单位" type="string" value="" desc="拟制/修订单位" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
 </attributes>

com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java

@@ -353,6 +353,7 @@ public class Report1Gener {
 		
 		dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
 		dataMap.put("file_table", fileTable);
+		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);

com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml

@@ -4361,146 +4361,98 @@ y7fdOgAAAABJRU5ErkJggk==
                 </w:pPr>
             </w:p>
             <wx:sub-section>
-                <w:p wsp:rsidR="00B941E2" wsp:rsidRDefault="00B941E2">
+                 <w:p wsp:rsidR="003811F1" wsp:rsidRDefault="00136AA7" wsp:rsidP="003811F1">
                     <w:pPr>
                         <w:pStyle w:val="1"/>
                         <w:listPr>
                             <w:ilvl w:val="0"/>
-                            <w:ilfo w:val="0"/>
+                            <w:ilfo w:val="3"/>
+                            <wx:t wx:val="10."/>
+                            <wx:font wx:val="Times New Roman"/>
                         </w:listPr>
                         <w:tabs>
                             <w:tab w:val="left" w:pos="360"/>
                         </w:tabs>
-                    </w:pPr>
-                    <w:r>
                         <w:rPr>
-                            <w:rFonts w:hint="fareast"/>
                             <w:lang w:val="EN-US"/>
                         </w:rPr>
-                        <w:t>表单/模板</w:t>
+                    </w:pPr>
+                    <aml:annotation aml:id="1" w:type="Word.Bookmark.Start" w:name="_Toc108710223"/>
+                    <w:r>
+                        <w:rPr>
+							<w:rFonts w:hint="fareast"/>
+							<wx:font wx:val="黑体"/>
+						</w:rPr>
+                        <w:t>附件</w:t>
                     </w:r>
+                    <aml:annotation aml:id="1" w:type="Word.Bookmark.End"/>
                 </w:p>
-                <w:p wsp:rsidR="00B941E2" wsp:rsidRDefault="00B941E2">
+				<#if (file_table_count ==0 )>
+                <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                     <w:pPr>
                         <w:rPr>
-                            <w:rFonts w:ascii="Arial" w:h-ansi="Arial" w:cs="Arial" w:hint="fareast"/>
+                            <w:rFonts w:hint="fareast"/>
-                            <wx:font wx:val="Arial"/>
-                            <w:sz w:val="20"/>
-                            <w:sz-cs w:val="20"/>
                         </w:rPr>
                     </w:pPr>
                     <w:r>
                         <w:rPr>
-                            <w:rFonts w:ascii="Arial" w:h-ansi="Arial" w:cs="Arial" w:hint="fareast"/>
+                            <w:rFonts w:hint="fareast"/>
                             <wx:font wx:val="宋体"/>
-                            <w:sz w:val="20"/>
-                            <w:sz-cs w:val="20"/>
                         </w:rPr>
-                        <w:t>具体模板请下载使用：</w:t>
+                        <w:t>无</w:t>
                     </w:r>
                 </w:p>
-                <w:p wsp:rsidR="00B941E2" wsp:rsidRDefault="00B941E2">
+				<#else>
+					<#list file_table as table4>
+						<w:p wsp:rsidR="003811F1" wsp:rsidRDefault="000D620D" wsp:rsidP="00692573">
+						  <w:pPr>
+						  </w:pPr>
+						  <w:hlink w:dest="${table4.link}">
+							<w:r wsp:rsidR="00692573" wsp:rsidRPr="000D620D">
+							  <w:rPr>
+								<w:rStyle w:val="a4"/>
+							  </w:rPr>
+							  <w:t>${table4.file_name}</w:t>
+							</w:r>
+						  </w:hlink>
+						</w:p>
+				    </#list>
+					<#list repository_shape_table as table1>
+					<#list table1.shape_File_Table as table11>
+              <w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="005011CF">
+                <w:pPr>
+                  <w:pStyle w:val="p0"/>
+                  <w:rPr>
+                    <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体"/>
+                    <wx:font wx:val="宋体"/>
+                    <w:color w:val="000000"/>
+                    <w:sz w:val="22"/>
+                    <w:sz-cs w:val="20"/>
+                  </w:rPr>
+                </w:pPr>
+                <w:hlink w:dest="${table11.shape_file_link}">
+                  <w:r wsp:rsidR="00CB55CB" wsp:rsidRPr="005011CF">
+                    <w:rPr>
+                      <w:rStyle w:val="a4"/>
+                      <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体" w:hint="fareast"/>
+                      <wx:font wx:val="宋体"/>
+                      <w:sz w:val="22"/>
+                      <w:sz-cs w:val="20"/>
+                    </w:rPr>
+                    <w:t>${table11.shape_file_name}</w:t>
+                  </w:r>
+                </w:hlink>
+              </w:p>
+			  </#list>
+              </#list>
+                <w:p wsp:rsidR="00B739CB" wsp:rsidRDefault="00B739CB">
                     <w:pPr>
                         <w:rPr>
                             <w:rFonts w:hint="fareast"/>
-                            <w:lang w:val="ZH-CN"/>
                         </w:rPr>
                     </w:pPr>
                 </w:p>
-                <aml:annotation aml:id="0" w:type="Word.Bookmark.Start" w:name="_1680846207"/>
+				</#if>
-                <aml:annotation aml:id="0" w:type="Word.Bookmark.End"/>
-                <w:p wsp:rsidR="00B941E2" wsp:rsidRDefault="00B941E2">
-                    <w:pPr>
-                        <w:rPr>
-                            <w:rFonts w:hint="fareast"/>
-                            <w:lang w:val="ZH-CN"/>
-                        </w:rPr>
-                    </w:pPr>
-                    <w:r>
-                        <w:rPr>
-                            <w:lang w:val="ZH-CN"/>
-                        </w:rPr>
-                        <w:pict>
-                            <v:shapetype id="_x0000_t75" coordsize="21600,21600" o:spt="75" o:preferrelative="t" path="m@4@5l@4@11@9@11@9@5xe" filled="f" stroked="f">
-                                <v:stroke joinstyle="miter"/>
-                                <v:formulas>
-                                    <v:f eqn="if lineDrawn pixelLineWidth 0"/>
-                                    <v:f eqn="sum @0 1 0"/>
-                                    <v:f eqn="sum 0 0 @1"/>
-                                    <v:f eqn="prod @2 1 2"/>
-                                    <v:f eqn="prod @3 21600 pixelWidth"/>
-                                    <v:f eqn="prod @3 21600 pixelHeight"/>
-                                    <v:f eqn="sum @0 0 1"/>
-                                    <v:f eqn="prod @6 1 2"/>
-                                    <v:f eqn="prod @7 21600 pixelWidth"/>
-                                    <v:f eqn="sum @8 21600 0"/>
-                                    <v:f eqn="prod @7 21600 pixelHeight"/>
-                                    <v:f eqn="sum @10 21600 0"/>
-                                </v:formulas>
-                                <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
-                                <o:lock v:ext="edit" aspectratio="t"/>
-                            </v:shapetype>
-                            <w:binData w:name="wordml://06000002.emz" xml:space="preserve">H4sIAAAAAAAEC+1YTWhUVxQ+M0ZNRO1gg9XdaBFKojXxD3SjURJiMRiapkFJMakmGkkyEoOp+JNB
-SmoptKVQ6TKb2CoY06ZBBX+wuIggFa240S5USgV/F0HDLHx+33vvTN+8zsubl5kEF97km3PuOfee
-75xz70ByQyLSCuQBIaABWAboKCgQ+XaaSLS8qsJcMVekEM6wLrDlp1OhTBFZiSD9Ll/+mTwZ+Dks
-82Cfafvm27phGNIBvTci8j4kc1gPRAGdUyckbtBtj/ha1eBI6ozHwZpWAL2ARKz9UagfAJRECJ9I
-2fRTpA7EsX5TzW/IbGv9Z791du03cg3GzaRE8iYSiZyDcd/y+3fgbf8n9/5d2DrPyAaZfle87n82
-3NybK/5M4+g6zVvnftKvfr/9bv9E8GvMBxf7kn1V26Obl5M25qJ2d15e80zq15iUz+5eN/nUNty1
-3pNf16STmk9Q/svbFxkvnj9O1snY6fqi8f1kUH7ysWbKW8daTXmlbXmyB1oref86WOwJzSsI/52T
-X6fUzT6wH+SkjzGd/MoxlgzCzzjXjlSncGhO7nPh2qd9ZZ7QnPz4tR6VzpoZQ+1uqfH9ZFB+xvt3
-eNDknQx+v/zdfu2D2+4196vfa5+XPdf8Gi+o9MrPbferPyivrnfyHP/lxJh/N/v/9SXCPJ0xg+jp
-9g5fvWrmVLx4ScNk8wflZn7pasi0B8694+HOFf94uXPBnw13Lvh5BpneNfK5R7b/f2bD7c5loueO
-d4vwHJDxDYMPER8De6BQjwDOcT5sznpC4fDCGtkve6VTmqTNuWRc+p+/xj9PdFtb8dZhjM4G/yBf
-MqzRWVhEs/FjZNCU6u8tuD/9OyQa1G6Hxb6QGTD1DUbkaHh4J+PGTw0d+QqL31u6q1Lz417uw0OK
-Ee23/J2FU4s0JuXpUmt9fM2Tb8pHRXTdw4s3zLhnEXfHPsnn2kWA9l71WaDmm47anWcygg5wn47v
-eVAiPfyokhbZjpenGE4mJs04nahskUapxCm1QK+VjVw25iixvfG/r5m5csqmz3p3X5OzB/YyiMN7
-2Su3f7q9oPr6IdPPNGf8t0nil6x9r24v7Ymdw/ta3QhOHaP5n3vVENormjh4RznWmZ//99tmqf7D
-intvmjvfbU3Mc8uAdWa6XuXoT+/MTncmn2DBl0AesBBoAJYBrKfx5e9lsm6oTH14VpRNAOc6mqF8
-BDQAC3Z379x1tLamDqfTITukssM6Y56zE7wYfHqkpN15L/BgKVFgDrARpx2TdtkMtOL7yKH+Qujp
-+OjvBX4ANsgaqZc63I12ZBOTLtybekRtN7/ZjYjZipvTAdsBWS0lUiqr8Gn9LLFlhahWAq3U5dXV
-FcirFHzlcgjRuuz6eVuZ/4dg+QLgYH4RgD1kj7Uer3p5aVgrRwSg/hqr+FOSABYAAB==
-</w:binData>
-                            <v:shape id="Object 8" o:spid="_x0000_i1025" type="#_x0000_t75" style="width:76.8pt;height:55.8pt;mso-position-horizontal-relative:page;mso-position-vertical-relative:page" o:ole="">
-                                <v:imagedata src="wordml://06000002.emz" o:title=""/>
-                            </v:shape>
-                            <o:OLEObject Type="Embed" ProgID="Word.Document.8" ShapeID="Object 8" DrawAspect="Icon" ObjectID="_1717592739">
-                                <o:WordFieldCodes>\s</o:WordFieldCodes>
-                            </o:OLEObject>
-                        </w:pict>
-                    </w:r>
-                    <w:r wsp:rsidR="009A3E48">
-                        <w:rPr>
-                            <w:lang w:val="ZH-CN"/>
-                        </w:rPr>
-                        <w:pict>
-                            <w:binData w:name="wordml://06000003.emz" xml:space="preserve">H4sIAAAAAAAEC+1YXWhUVxCe3cYYS7WLRo344KoVBDUmVi31JYmSEMVg/KtEo01sEn+ISZqIJtTU
-tZQYUVof+lBBIVga9cG/YvwBUZA8KBa1FPJkKQZKfREpBAx58Pp9995ZT2422bubVSw45tuZe+ac
-+WbmnOsmJyAitUA6EAC2AYsAlXHjRH6AM1xYUsQZaVNEMuEM6gRXfzEGxgciSxDkgseXcS1NLp0J
-ShbGP3J901zbsixphN0REpkNzRyWA2FAn2kTErHodiWSpxYcUZvxKKxpMdABSMhZH4Y5F6AmAvhE
-yrafarAgjvMzePgdedpcvvW3vftbrFSDcf2USN6BgYGUg3Hf88fvwPv+v93zl5WdXlFwIGQlgyv3
-T/t+T4Y7/8nwmmv8vqv/B/7WX7fgv3lHjpzfHd0Tc5y2t/7PyrMsBfsxf9WkKLQ/fuvv7umyE3j6
-vDfKQ5vy6O/u6JjmwPjKTT1a/rJj2Vbfi/9svp+utljsgwp9yqta64un/dbPuOSlMA+tveNW+xBu
-ziWv5qLPNb/MtBSaVyL8jMNeq5h7YXIpnzlGPuWmTgX/43//HFSjl085RtKJ1G+ed+0/98TkVTtW
-vYe6P7UUmlMi/Mp5/UFn9PzxLJR8P2NIDqnm5zlT0fPO/lP4bmrdqrW+eNpP/ea7x9qV4+tTqzUl
-i7aOU8fjVb8ffjOuX1vjx9PvKn8qv387z54b8ffm+L99ibBP8Xo5nD/W2rv37tk5zZu/oOJt8yfK
-zfxi1TBcvd5xc20y3KniT5Y7Ffyj4U4FP/fA71kjn1dG+/fnaLi9ubzpZ+PeIjgRZLzD4EXEOqAB
-Bu0QYMrNoP3UFggGZ62XFmmSvVIte8wpSdkPLke2Dxx0lvLLpn8C+PN4k+HI2skN9nfQiel5tlZ/
-fkbv2B+RaKLjblisC+TZ9qA7GJH24N0djBs53/XdYUyYunBnsebH+boufMHxr508poHjKhdznfmR
-Zc+OFvaL6Lynt/6w415H3Kp9ksH5cwDtvdrjQc07HR0396QPHeA6lePcKJE2fpTILvkKN0/12Jl6
-qcHuhKVMKqUYu7QL9kZZyWkjSo7rjfz1u50rH9n08ZP2VZs9cKdBfdvEXnn9Y90JpQ9bbT/T/PD1
-Ioncdta97FnYVn8D92ub+rDrkJp/npRCaa84ROEZpeTbn0P97rCU3nHiPkn35vtlNfMsu+Tsmc5X
-3f/zxxNi7ckGTGgHcF0os4BtwCKA9VS+uFIg+V0F6mN9q4E0QKUGxiqgApi5++COne0b1xdKM/ap
-Gvd5xY3cYxPsG+MRtHmXR795NorwHAbYk5WIVC91sgaoxTtJof8TYAoQixPD9pyT0MeBFbJMymUT
-zkidVCHafpyfckSus9/wSsStRbaNGPtGPpccyZWl+HT+LXB1kaiVAyvX49XZReDNBV+htCJaM+Ly
-xDL/JskGRzPg5BaCZh/Z53j18uBkApQQQPsV5I8qLwQWAAA=
-</w:binData>
-                            <v:shape id="_x0000_i1030" type="#_x0000_t75" style="width:76.2pt;height:54.6pt" o:ole="">
-                                <v:imagedata src="wordml://06000003.emz" o:title=""/>
-                            </v:shape>
-                            <o:OLEObject Type="Embed" ProgID="Excel.Sheet.12" ShapeID="_x0000_i1030" DrawAspect="Icon" ObjectID="_1717592740"/>
-                        </w:pict>
-                    </w:r>
-                </w:p>
             </wx:sub-section>
             <w:sectPr wsp:rsidR="00B941E2">
                 <w:hdr w:type="even">

com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java

@@ -455,15 +455,10 @@ public class Report1Gener {
 		//相关文件
 		dataMap.put("relevant_table", related_files);//table7
 
-
-
-
-
-
-
 		
 		dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
 		dataMap.put("file_table", fileTable);
+		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);